paradizelost/paperless-ngx
1
0
Fork 0
mirror of https://github.com/paperless-ngx/paperless-ngx.git synced 2025-05-01 11:19:32 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix bug where docker-entrypoint.sh exits w/o notice

Browse Source 
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.
This commit is contained in:
Sven Fischer 2018-05-15 19:34:21 +02:00
parent bce2d3dd22
commit 1c0801a3ec
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
scripts/docker-entrypoint.sh
View File

@ -46,11 +46,10 @@ migrations() {
# A simple lock file in case other containers use this startup # A simple lock file in case other containers use this startup
LOCKFILE="/usr/src/paperless/data/db.sqlite3.migration" LOCKFILE="/usr/src/paperless/data/db.sqlite3.migration"
set -o noclobber
# check for and create lock file in one command # check for and create lock file in one command
(> ${LOCKFILE}) &> /dev/null if (set -o noclobber; echo "$$" > "${LOCKFILE}") 2> /dev/null
if [ $? -eq 0 ]
then then
trap 'rm -f "${LOCKFILE}"; exit $?' INT TERM EXIT
sudo -HEu paperless "/usr/src/paperless/src/manage.py" "migrate" sudo -HEu paperless "/usr/src/paperless/src/manage.py" "migrate"
rm ${LOCKFILE} rm ${LOCKFILE}
fi fi