From ec09768b7eea7fad39339dac18e938a347e9fdaa Mon Sep 17 00:00:00 2001 From: jubianchi Date: Sun, 13 Aug 2017 18:57:54 +0200 Subject: [PATCH] fix: Entrypoint works with the lastest base image Closes #20 --- .gitignore | 3 ++- Dockerfile | 2 +- Makefile | 2 +- bin/{entry_script.sh => entrypoint.sh} | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) rename bin/{entry_script.sh => entrypoint.sh} (77%) diff --git a/.gitignore b/.gitignore index 945ed42..17e07e7 100644 --- a/.gitignore +++ b/.gitignore @@ -2,4 +2,5 @@ vendor/ docker.lock bin/ !bin/dcv -!bin/entry_script.sh +!bin/entrypoint.sh +.cache/ diff --git a/Dockerfile b/Dockerfile index d101d8f..483742c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -19,5 +19,5 @@ USER dcv VOLUME /input WORKDIR /input -ENTRYPOINT ["/dcv/bin/entry_script.sh"] +ENTRYPOINT ["/dcv/bin/entrypoint.sh"] CMD ["render", "-m", "image", "-f"] diff --git a/Makefile b/Makefile index 6ae710c..c33f710 100644 --- a/Makefile +++ b/Makefile @@ -23,7 +23,7 @@ fix-cs: clean: rm -rf vendor/ -docker.lock: Dockerfile vendor +docker.lock: Dockerfile bin/entrypoint.sh vendor src/application.php src/functions.php $(COMPOSER) dump-autoload --classmap-authoritative $(DOCKER) build -t $(DCV_IMAGE_NAME) . touch docker.lock diff --git a/bin/entry_script.sh b/bin/entrypoint.sh similarity index 77% rename from bin/entry_script.sh rename to bin/entrypoint.sh index c1159a2..6b58ff9 100755 --- a/bin/entry_script.sh +++ b/bin/entrypoint.sh @@ -6,7 +6,7 @@ CURRENT_DIR=$(dirname $0) if [ "$1" = "render" ] then - $("$CURRENT_DIR/dcv" "$@") + $CURRENT_DIR/dcv "$@" else exec "$@" fi