From a752a4a91a68dfe7794fd302742a4e32cdbafdfc Mon Sep 17 00:00:00 2001 From: Sven Fischer Date: Tue, 15 May 2018 19:34:21 +0200 Subject: [PATCH] fix bug where docker-entrypoint.sh exits w/o notice This commit fixes a nasty bug, where the docker-entrypoint.sh silently exits without any error message. The test for a lock file can fail and due to the `set -e` at the beginning of the file the bash script exists without starting the paperless application. It is fixed by moving the check for the existence of the lock file into the if statement, where the `set -e` does not trigger an exit in case the statement fails. Additionally this commit enables the script to trap exit signals and in that case deletes the lock file. --- scripts/docker-entrypoint.sh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/scripts/docker-entrypoint.sh b/scripts/docker-entrypoint.sh index 2534012e8..df8df8fcd 100644 --- a/scripts/docker-entrypoint.sh +++ b/scripts/docker-entrypoint.sh @@ -46,11 +46,10 @@ migrations() { # A simple lock file in case other containers use this startup LOCKFILE="/usr/src/paperless/data/db.sqlite3.migration" - set -o noclobber # check for and create lock file in one command - (> ${LOCKFILE}) &> /dev/null - if [ $? -eq 0 ] + if (set -o noclobber; echo "$$" > "${LOCKFILE}") 2> /dev/null then + trap 'rm -f "${LOCKFILE}"; exit $?' INT TERM EXIT sudo -HEu paperless "/usr/src/paperless/src/manage.py" "migrate" rm ${LOCKFILE} fi