Merge pull request #21 from pmsipilot/fix-entrypoint
fix: Entrypoint works with the lastest base image
This commit is contained in:
commit
acc508b1d8
4 changed files with 5 additions and 4 deletions
3
.gitignore
vendored
3
.gitignore
vendored
|
@ -2,4 +2,5 @@ vendor/
|
|||
docker.lock
|
||||
bin/
|
||||
!bin/dcv
|
||||
!bin/entry_script.sh
|
||||
!bin/entrypoint.sh
|
||||
.cache/
|
||||
|
|
|
@ -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"]
|
||||
|
|
2
Makefile
2
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
|
||||
|
|
|
@ -6,7 +6,7 @@ CURRENT_DIR=$(dirname $0)
|
|||
|
||||
if [ "$1" = "render" ]
|
||||
then
|
||||
$("$CURRENT_DIR/dcv" "$@")
|
||||
$CURRENT_DIR/dcv "$@"
|
||||
else
|
||||
exec "$@"
|
||||
fi
|
Loading…
Reference in a new issue