simono41/docker-compose-viz
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix: Entrypoint works with the lastest base image

Browse source 
Closes #20
This commit is contained in:
jubianchi 2017-08-13 18:57:54 +02:00
parent 66399cf913
commit ec09768b7e
No known key found for this signature in database
GPG key ID: 5D9C896D2AA9E390
4 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
.gitignore vendored
View file

@ -2,4 +2,5 @@ vendor/
docker.lock docker.lock
bin/ bin/
!bin/dcv !bin/dcv
!bin/entry_script.sh !bin/entrypoint.sh
.cache/

2
Dockerfile
View file

@ -19,5 +19,5 @@ USER dcv
VOLUME /input VOLUME /input
WORKDIR /input WORKDIR /input
ENTRYPOINT ["/dcv/bin/entry_script.sh"] ENTRYPOINT ["/dcv/bin/entrypoint.sh"]
CMD ["render", "-m", "image", "-f"] CMD ["render", "-m", "image", "-f"]

2
Makefile
View file

@ -23,7 +23,7 @@ fix-cs:
clean: clean:
rm -rf vendor/ 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 $(COMPOSER) dump-autoload --classmap-authoritative
$(DOCKER) build -t $(DCV_IMAGE_NAME) . $(DOCKER) build -t $(DCV_IMAGE_NAME) .
touch docker.lock touch docker.lock

2
bin/entry_script.sh → bin/entrypoint.sh
View file

@ -6,7 +6,7 @@ CURRENT_DIR=$(dirname $0)
if [ "$1" = "render" ] if [ "$1" = "render" ]
then then
$("$CURRENT_DIR/dcv" "$@") $CURRENT_DIR/dcv "$@"
else else
exec "$@" exec "$@"
fi fi