summaryrefslogtreecommitdiff
path: root/docker/assets/wrapper
diff options
context:
space:
mode:
authorKamil Trzcinski <ayufan@ayufan.eu>2015-07-21 16:44:38 +0200
committerKamil Trzcinski <ayufan@ayufan.eu>2015-07-23 14:27:25 +0200
commit47e81e75d7545a5d8601210055a7a6349aaaa528 (patch)
treee5ff0e4f46d10a729c516b8ddb2d83c024fa67fc /docker/assets/wrapper
parent8ba1a7a03f849cd83a83476c920c2c0572e675d7 (diff)
downloadgitlab-ce-docker-pin.tar.gz
PIN users to UIDs and monkey patch initctldocker-pin
Diffstat (limited to 'docker/assets/wrapper')
-rwxr-xr-xdocker/assets/wrapper9
1 files changed, 3 insertions, 6 deletions
diff --git a/docker/assets/wrapper b/docker/assets/wrapper
index 8bc8370fbc9..cd7e50b5719 100755
--- a/docker/assets/wrapper
+++ b/docker/assets/wrapper
@@ -7,15 +7,12 @@ function sigterm_handler() {
trap "sigterm_handler; exit" TERM
-function entrypoint() {
- /opt/gitlab/embedded/bin/runsvdir-start &
- gitlab-ctl reconfigure # will also start everything
- gitlab-ctl tail # tail all logs
-}
+set -xe
if [[ ! -e /etc/gitlab/gitlab.rb ]]; then
cp /assets/gitlab.rb /etc/gitlab/gitlab.rb
chmod 0600 /etc/gitlab/gitlab.rb
fi
-entrypoint
+gitlab-ctl reconfigure # start everything
+gitlab-ctl tail # all logs