summaryrefslogtreecommitdiff
path: root/docker
diff options
context:
space:
mode:
authorStan Hu <stanhu@gmail.com>2015-05-13 15:55:55 +0000
committerStan Hu <stanhu@gmail.com>2015-05-13 20:31:23 +0000
commitcfe6013b96ad2f9214f663b648d5f1979aecccec (patch)
tree701d9b220e7dc4619c107d69059bde97ddce28e9 /docker
parentcc0a4b7ee896a1d0ca1b0d50d6d4f9f9b480e3d0 (diff)
downloadgitlab-ce-cfe6013b96ad2f9214f663b648d5f1979aecccec.tar.gz
Use apt repositories to upgrade Docker builds to the latest GitLab version
Reduces the need to bump versions periodically.
Diffstat (limited to 'docker')
-rw-r--r--docker/app/Dockerfile11
-rw-r--r--docker/single/Dockerfile16
2 files changed, 12 insertions, 15 deletions
diff --git a/docker/app/Dockerfile b/docker/app/Dockerfile
index df828a2a349..fe3f7f0bcd2 100644
--- a/docker/app/Dockerfile
+++ b/docker/app/Dockerfile
@@ -5,15 +5,14 @@ RUN apt-get update -q \
&& DEBIAN_FRONTEND=noninteractive apt-get install -qy --no-install-recommends \
ca-certificates \
openssh-server \
- wget
+ wget \
+ apt-transport-https
# Download & Install GitLab
-# 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.1~omnibus.2-1_amd64.deb \
- && dpkg -i $TMP_FILE \
- && rm -f $TMP_FILE
+RUN echo "deb https://packages.gitlab.com/gitlab/gitlab-ce/ubuntu/ `lsb_release -cs` main" > /etc/apt/sources.list.d/gitlab_gitlab-ce.list
+RUN wget -q -O - https://packages.gitlab.com/gpg.key | apt-key add -
+RUN apt-get update && apt-get install -yq --no-install-recommends gitlab-ce
# Manage SSHD through runit
RUN mkdir -p /opt/gitlab/sv/sshd/supervise \
diff --git a/docker/single/Dockerfile b/docker/single/Dockerfile
index 8cdc24cf045..89224572534 100644
--- a/docker/single/Dockerfile
+++ b/docker/single/Dockerfile
@@ -2,20 +2,18 @@ FROM ubuntu:14.04
MAINTAINER Sytse Sijbrandij
# Install required packages
-RUN apt-get update
-ENV DEBIAN_FRONTEND noninteractive
-RUN apt-get install -yq --no-install-recommends \
+RUN apt-get update -q \
+ && DEBIAN_FRONTEND=noninteractive apt-get install -yq --no-install-recommends \
ca-certificates \
openssh-server \
- wget
+ wget \
+ apt-transport-https
# Download & Install GitLab
-# 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.1~omnibus.2-1_amd64.deb \
- && dpkg -i $TMP_FILE \
- && rm -f $TMP_FILE
+RUN echo "deb https://packages.gitlab.com/gitlab/gitlab-ce/ubuntu/ `lsb_release -cs` main" > /etc/apt/sources.list.d/gitlab_gitlab-ce.list
+RUN wget -q -O - https://packages.gitlab.com/gpg.key | apt-key add -
+RUN apt-get update && apt-get install -yq --no-install-recommends gitlab-ce
# Manage SSHD through runit
RUN mkdir -p /opt/gitlab/sv/sshd/supervise \