Skip to content

CVS-187613_fix_c_api_demo #4252

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ngrozae wants to merge 1 commit into
base: main
Choose a base branch
from
+5 −5
Open

CVS-187613_fix_c_api_demo #4252

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion demos/c_api_minimal_app/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ clean:
from_docker:
mkdir -p capi/$(DIST_OS)
docker run $(OVMS_CPP_DOCKER_IMAGE)-pkg:$(OVMS_CPP_IMAGE_TAG) bash -c \
"tar -c -C /ovms_pkg/$(BASE_OS) ovms.tar.gz ; sleep 2" | tar -x -C capi/$(DIST_OS)/ && cd ../../
"tar -c -C /ovms_pkg/$(BASE_OS) ovms.tar ; sleep 2" | tar -x -C capi/$(DIST_OS)/ && cd ../../
Comment on lines 45 to +46
-docker rm -v $$(docker ps -a -q -f status=exited -f ancestor=$(OVMS_CPP_DOCKER_IMAGE)-pkg:$(OVMS_CPP_IMAGE_TAG))

from_web:
Expand Down
4 changes: 2 additions & 2 deletions demos/c_api_minimal_app/capi_files/Dockerfile.redhat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ FROM $BASE_IMAGE as base_build
SHELL ["/bin/bash", "-c"]
RUN yum install -y xz git shadow-utils make gcc gcc-c++
WORKDIR /
COPY ovms.tar.gz /
COPY ovms.tar /
RUN env
RUN tar -xf ovms.tar.gz
RUN tar -xf ovms.tar
Comment on lines +22 to +24
RUN groupadd --gid 5000 ovms && \
useradd --home-dir /home/ovms --create-home --uid 5000 --gid 5000 --shell /bin/bash --skel /dev/null ovms && \
chown -R ovms:ovms /ovms
Expand Down
4 changes: 2 additions & 2 deletions demos/c_api_minimal_app/capi_files/Dockerfile.ubuntu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ SHELL ["/bin/bash", "-xo", "pipefail", "-c"]
RUN groupadd --gid 5000 ovms && useradd --home-dir /home/ovms --create-home --uid 5000 \
--gid 5000 --shell /bin/bash --skel /dev/null ovms

COPY ovms.tar.gz /
RUN tar -xf ovms.tar.gz
COPY ovms.tar /
RUN tar -xf ovms.tar
Comment on lines +25 to +26
RUN chown -R ovms:ovms /ovms
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ #

Expand Down