diff options
| author | Robert Schilling <rschilling@student.tugraz.at> | 2015-02-23 14:31:48 +0000 |
|---|---|---|
| committer | Robert Schilling <rschilling@student.tugraz.at> | 2015-02-23 14:31:48 +0000 |
| commit | 348b8737e46fa3f82ea9e5351fd57870b10872a3 (patch) | |
| tree | 96a2a42dcaa5686a4c3fc662317ce441427eabfe | |
| parent | c8dad4f6112acba1f90d5c4bc7752f3ae223dd86 (diff) | |
| parent | e23110e6f158608c75e4c661fd57a4bb9c96334a (diff) | |
| download | gitlab-ce-348b8737e46fa3f82ea9e5351fd57870b10872a3.tar.gz | |
Merge branch 'master' into 'master'
Bump GitLab for Docker to version 7.8.0
See merge request !347
| -rw-r--r-- | docker/Dockerfile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile index ec0923bd4c7..cfb89357a67 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -11,7 +11,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.7.2-omnibus.5.4.2.ci-1_amd64.deb \ + wget -q -O $TMP_FILE https://downloads-packages.s3.amazonaws.com/ubuntu-14.04/gitlab_7.8.0-omnibus-1_amd64.deb \ && dpkg -i $TMP_FILE \ && rm -f $TMP_FILE @@ -31,4 +31,4 @@ 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 gitlab-ctl reconfigure & /opt/gitlab/embedded/bin/runsvdir-start
\ No newline at end of file |