Upgrade to 7.8.4

genezys · genezys · commit 2129bf018998 · 2015-03-15T12:53:39.000+01:00
diff --git a/Dockerfile b/Dockerfile
@@ -1,6 +1,6 @@
-# Build: docker build -t genezys/gitlab:7.8.1 .
+# Build: docker build -t genezys/gitlab:7.8.4 .
 # Data: docker run --name gitlab_data --volume /var/opt/gitlab --volume /var/log/gitlab --volume /etc/gitlab ubuntu:14.04 /bin/true
-# Run: docker run --detach --name gitlab_app --publish 8080:80 --publish 2222:22 --volumes-from gitlab_data genezys/gitlab:7.8.1
+# Run: docker run --detach --name gitlab_app --publish 8080:80 --publish 2222:22 --volumes-from gitlab_data genezys/gitlab:7.8.4
 
 FROM ubuntu:14.04
 MAINTAINER Vincent Robert <vincent.robert@genezys.net>
@@ -16,7 +16,7 @@ RUN apt-get update -q \
 # If the Omnibus package version below is outdated please contribute a merge request to update it.
 # If you run GitLab Enterprise Edition point it to a location where you have downloaded it.
 RUN TMP_FILE=$(mktemp); \
-    wget -q -O $TMP_FILE https://downloads-packages.s3.amazonaws.com/ubuntu-14.04/gitlab_7.8.1-omnibus-1_amd64.deb \
+    wget -q -O $TMP_FILE https://downloads-packages.s3.amazonaws.com/ubuntu-14.04/gitlab_7.8.4-omnibus-1_amd64.deb \
     && dpkg -i $TMP_FILE \
     && rm -f $TMP_FILE
 
@@ -28,12 +28,16 @@ RUN mkdir -p /opt/gitlab/sv/sshd/supervise \
     && ln -s /opt/gitlab/sv/sshd /opt/gitlab/service \
     && mkdir -p /var/run/sshd
 
+# Add bootstrap script
+ADD gitlab.rb /opt/gitlab/etc/gitlab.rb.template
+ADD gitlab.sh /usr/local/bin/gitlab.sh
+RUN chmod +x /usr/local/bin/gitlab.sh
+
 # Expose web & ssh
 EXPOSE 80 22
 
 # Volume & configuration
 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
+CMD ["/usr/local/bin/gitlab.sh"]
diff --git a/README.md b/README.md
@@ -32,7 +32,7 @@ sudo docker run --name gitlab_data --volume /var/opt/gitlab --volume /var/log/gi
 After creating this, run GitLab:
 
 ```bash
-sudo docker run --detach --name gitlab_app --publish 8080:80 --publish 2222:22 --volumes-from gitlab_data genezys/gitlab:7.8.1
+sudo docker run --detach --name gitlab_app --publish 8080:80 --publish 2222:22 --volumes-from gitlab_data genezys/gitlab:7.8.4
 ```
 
 It might take a while before the docker container is responding to queries. You can follow the configuration process with `docker logs -f gitlab_app`.
diff --git a/crane.yml b/crane.yml
@@ -9,7 +9,7 @@ containers:
       - "/etc/gitlab"
 
   gitlab_app:
-    image: genezys/gitlab:7.8.1
+    image: genezys/gitlab:7.8.4
     dockerfile: .
     run:
       detach: true
@@ -20,7 +20,7 @@ containers:
       - gitlab_data
 
   gitlab_debug:
-    image: genezys/gitlab:7.8.1
+    image: genezys/gitlab:7.8.4
     run:
       rm: true
       tty: true
diff --git a/gitlab.sh b/gitlab.sh
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+# Copy the template gitlab.rb to the configuration volume
+if [ ! -f /etc/gitlab/gitlab.rb ]
+then
+	cp /opt/gitlab/etc/gitlab.rb.template /etc/gitlab/gitlab.rb
+fi
+
+# Run reconfigure in the background while we start the services
+gitlab-ctl reconfigure &
+/opt/gitlab/embedded/bin/runsvdir-start
