summaryrefslogtreecommitdiff
path: root/docker
diff options
context:
space:
mode:
authorSytse Sijbrandij <sytse@gitlab.com>2014-12-04 11:15:26 +0000
committerSytse Sijbrandij <sytse@gitlab.com>2014-12-04 11:15:26 +0000
commitc59b5e4e68616f7c43df148cf38bb3e36a08725a (patch)
tree32a3979b4ec8427e31e3605378b17bcb57583ed5 /docker
parent236741008ed82b77e3e4357e07060f7764d1d21a (diff)
parent14a1c1b4e6393dab2bd4c691a7241810980c0623 (diff)
downloadgitlab-ce-c59b5e4e68616f7c43df148cf38bb3e36a08725a.tar.gz
Merge branch 'docker-version-upgrades' into 'master'
Docker version upgrades See merge request !251
Diffstat (limited to 'docker')
-rw-r--r--docker/Dockerfile2
1 files changed, 2 insertions, 0 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile
index e9b7883e983..a7b44d823ea 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -8,6 +8,8 @@ RUN apt-get update -q \
&& apt-get clean
# Download & Install GitLab
+# If the Omnibus package version below is outdates 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.5.2-omnibus.5.2.1.ci-1_amd64.deb \
&& dpkg -i $TMP_FILE \