archive-gh-me/docker-gitlab
1
0
Fork 0
mirror of https://github.com/sameersbn/docker-gitlab.git synced 2026-01-25 14:08:09 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1772 from lordvlad/patch-1

Browse Source 
fix bootloop for rare race condition between kill and wait
This commit is contained in:
Niclas Mietz 2018-11-22 06:11:35 +01:00 committed by GitHub
commit 5aa9f6cff8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
entrypoint.sh
View File

@ -19,7 +19,7 @@ case ${1} in
SUPERVISOR_PID=$!
migrate_database
kill -15 $SUPERVISOR_PID
ps h -p $SUPERVISOR_PID > /dev/null && wait $SUPERVISOR_PID
ps h -p $SUPERVISOR_PID > /dev/null && wait $SUPERVISOR_PID || true
rm -rf /var/run/supervisor.sock
exec /usr/bin/supervisord -nc /etc/supervisor/supervisord.conf
;;