From f80c60f8359d3d053622e356086fb148b761d62c Mon Sep 17 00:00:00 2001 From: Shahar Evron Date: Thu, 3 Oct 2019 12:00:34 +0300 Subject: [PATCH] Fix check for `docker-entrypoint.d` The entrypoint script checks for the existence of `docker-entrypoint.d` in the CWD, but then run the scripts in `/docker-entrypoint.d`. This causes the scripts to either not run at all or fail if an inheriting image changes the `WORKDIR`. This fix makes sure the directory is always expected in the filesystem root. --- rootfs/setup/app/start_ckan.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rootfs/setup/app/start_ckan.sh b/rootfs/setup/app/start_ckan.sh index e2e69a8..d0dc6e7 100755 --- a/rootfs/setup/app/start_ckan.sh +++ b/rootfs/setup/app/start_ckan.sh @@ -3,7 +3,7 @@ python prerun.py # Run any startup scripts provided by images extending this one -if [[ -d "docker-entrypoint.d" ]] +if [[ -d "/docker-entrypoint.d" ]] then for f in /docker-entrypoint.d/*; do case "$f" in