Merge branch 'master' of github.com:gitlabhq/gitlabhq

docker/.dockerignore

+*.md

docker/Dockerfile

@@ -26,9 +26,12 @@ RUN mkdir -p /opt/gitlab/sv/sshd/supervise \
 # Expose web & ssh
 EXPOSE 80 22
 
-# Volume & configuration
+# Declare volumes
 VOLUME ["/var/opt/gitlab", "/var/log/gitlab", "/etc/gitlab"]
-ADD gitlab.rb /etc/gitlab/
 
-# Default is to run runit & reconfigure
-CMD gitlab-ctl reconfigure & /opt/gitlab/embedded/bin/runsvdir-start
\ No newline at end of file
+# Copy assets
+COPY assets/gitlab.rb /etc/gitlab/
+COPY assets/wrapper /usr/local/bin/
+
+# Wrapper to handle signal, trigger runit and reconfigure GitLab
+CMD ["/usr/local/bin/wrapper"]

docker/assets/wrapper

+#!/bin/bash
+
+function sigterm_handler() {
+    echo "SIGTERM signal received, try to gracefully shutdown all services..."
+    gitlab-ctl stop
+}
+
+trap "sigterm_handler; exit" TERM
+
+function entrypoint() {
+    # Default is to run runit and reconfigure GitLab
+    gitlab-ctl reconfigure &
+    /opt/gitlab/embedded/bin/runsvdir-start &
+    wait
+}
+
+entrypoint