diff options
| author | Sytse Sijbrandij <sytse@gitlab.com> | 2014-12-04 09:41:33 +0000 |
|---|---|---|
| committer | Sytse Sijbrandij <sytse@gitlab.com> | 2014-12-04 09:41:33 +0000 |
| commit | 236741008ed82b77e3e4357e07060f7764d1d21a (patch) | |
| tree | 41f77df14dc8f7368f2182412594bec33d6c312b /docker/Dockerfile | |
| parent | d45b25304c848596d5a1f45eeb8ff8a321d0f2d3 (diff) | |
| parent | 176105eca628b297fbfc20b29146f2a8d5ddd74d (diff) | |
| download | gitlab-ce-236741008ed82b77e3e4357e07060f7764d1d21a.tar.gz | |
Merge branch 'update-docker' into 'master'
Update Docker configuration to 7.5.2 + minor improvements
- Update to 7.5.2
- logs are now readable with `docker logs`
- recommend an interactive command line for configuration
See merge request !250
Diffstat (limited to 'docker/Dockerfile')
| -rw-r--r-- | docker/Dockerfile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile index d0b5338773e..e9b7883e983 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -9,7 +9,7 @@ RUN apt-get update -q \ # Download & Install GitLab RUN TMP_FILE=$(mktemp); \ - wget -q -O $TMP_FILE https://downloads-packages.s3.amazonaws.com/ubuntu-14.04/gitlab_7.5.1-omnibus.5.2.0.ci-1_amd64.deb \ + wget -q -O $TMP_FILE https://downloads-packages.s3.amazonaws.com/ubuntu-14.04/gitlab_7.5.2-omnibus.5.2.1.ci-1_amd64.deb \ && dpkg -i $TMP_FILE \ && rm -f $TMP_FILE @@ -29,4 +29,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 > /var/log/gitlab/reconfigure.log & /opt/gitlab/embedded/bin/runsvdir-start +CMD gitlab-ctl reconfigure & /opt/gitlab/embedded/bin/runsvdir-start |