summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Schilling <rschilling@student.tugraz.at>2015-01-30 22:31:24 +0000
committerRobert Schilling <rschilling@student.tugraz.at>2015-01-30 22:31:24 +0000
commit03430ad77cb36ecfb450f9e4dec28d3fff1499e3 (patch)
tree212e09bd49ad94e82ff2fe120d771a0828a751d5
parentc47328948b5fff218c68279260a57ab6b03e7423 (diff)
parenta7a45dc949b9475dff674be57e8d3a7aa8811857 (diff)
downloadgitlab-ce-03430ad77cb36ecfb450f9e4dec28d3fff1499e3.tar.gz
Merge branch 'master' into 'master'
Bump GitLab for Docker to version 7.7.2 See merge request !324
-rw-r--r--docker/Dockerfile2
1 files changed, 1 insertions, 1 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 70d6c721f1c..ec0923bd4c7 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.1-omnibus.5.4.1.ci-1_amd64.deb \
+ 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 \
&& dpkg -i $TMP_FILE \
&& rm -f $TMP_FILE