summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Schilling <rschilling@student.tugraz.at>2015-05-05 08:12:22 +0200
committerRobert Schilling <rschilling@student.tugraz.at>2015-05-05 08:12:22 +0200
commit1132084d3fcbb5623546730a6269b2a5d1c2ada3 (patch)
tree96ece4fd7bdcacc9433674576d8f61b297e27f17
parentb1c331a44100d65f933ba87f204bec94a72c07a0 (diff)
parent4fd3be137b3e1733c68876a07696084222191e77 (diff)
downloadgitlab-ce-1132084d3fcbb5623546730a6269b2a5d1c2ada3.tar.gz
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce
-rw-r--r--docker/Dockerfile4
1 files changed, 2 insertions, 2 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 69e34955b7f..df828a2a349 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-ce_7.10.0~omnibus.2-1_amd64.deb \
+ wget -q -O $TMP_FILE https://downloads-packages.s3.amazonaws.com/ubuntu-14.04/gitlab-ce_7.10.1~omnibus.2-1_amd64.deb \
&& dpkg -i $TMP_FILE \
&& rm -f $TMP_FILE
@@ -30,4 +30,4 @@ EXPOSE 80 22
COPY assets/wrapper /usr/local/bin/
# Wrapper to handle signal, trigger runit and reconfigure GitLab
-CMD ["/usr/local/bin/wrapper"]
+CMD ["/usr/local/bin/wrapper"] \ No newline at end of file