diff --git a/demos/c_api_minimal_app/Makefile b/demos/c_api_minimal_app/Makefile index 86e28febd5..5e2000bc49 100644 --- a/demos/c_api_minimal_app/Makefile +++ b/demos/c_api_minimal_app/Makefile @@ -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 ../../ -docker rm -v $$(docker ps -a -q -f status=exited -f ancestor=$(OVMS_CPP_DOCKER_IMAGE)-pkg:$(OVMS_CPP_IMAGE_TAG)) from_web: diff --git a/demos/c_api_minimal_app/capi_files/Dockerfile.redhat b/demos/c_api_minimal_app/capi_files/Dockerfile.redhat index 3c5dc003ef..36e378a0af 100644 --- a/demos/c_api_minimal_app/capi_files/Dockerfile.redhat +++ b/demos/c_api_minimal_app/capi_files/Dockerfile.redhat @@ -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 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 diff --git a/demos/c_api_minimal_app/capi_files/Dockerfile.ubuntu b/demos/c_api_minimal_app/capi_files/Dockerfile.ubuntu index 261de181f1..a55ccefec4 100644 --- a/demos/c_api_minimal_app/capi_files/Dockerfile.ubuntu +++ b/demos/c_api_minimal_app/capi_files/Dockerfile.ubuntu @@ -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 RUN chown -R ovms:ovms /ovms # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ #