Commit cfe6013b authored by Stan Hu's avatar Stan Hu

Use apt repositories to upgrade Docker builds to the latest GitLab version

Reduces the need to bump versions periodically.
parent cc0a4b7e
...@@ -5,15 +5,14 @@ RUN apt-get update -q \ ...@@ -5,15 +5,14 @@ RUN apt-get update -q \
&& DEBIAN_FRONTEND=noninteractive apt-get install -qy --no-install-recommends \ && DEBIAN_FRONTEND=noninteractive apt-get install -qy --no-install-recommends \
ca-certificates \ ca-certificates \
openssh-server \ openssh-server \
wget wget \
apt-transport-https
# Download & Install GitLab # 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. # If you run GitLab Enterprise Edition point it to a location where you have downloaded it.
RUN TMP_FILE=$(mktemp); \ RUN echo "deb https://packages.gitlab.com/gitlab/gitlab-ce/ubuntu/ `lsb_release -cs` main" > /etc/apt/sources.list.d/gitlab_gitlab-ce.list
wget -q -O $TMP_FILE https://downloads-packages.s3.amazonaws.com/ubuntu-14.04/gitlab-ce_7.10.1~omnibus.2-1_amd64.deb \ RUN wget -q -O - https://packages.gitlab.com/gpg.key | apt-key add -
&& dpkg -i $TMP_FILE \ RUN apt-get update && apt-get install -yq --no-install-recommends gitlab-ce
&& rm -f $TMP_FILE
# Manage SSHD through runit # Manage SSHD through runit
RUN mkdir -p /opt/gitlab/sv/sshd/supervise \ RUN mkdir -p /opt/gitlab/sv/sshd/supervise \
......
...@@ -2,20 +2,18 @@ FROM ubuntu:14.04 ...@@ -2,20 +2,18 @@ FROM ubuntu:14.04
MAINTAINER Sytse Sijbrandij MAINTAINER Sytse Sijbrandij
# Install required packages # Install required packages
RUN apt-get update RUN apt-get update -q \
ENV DEBIAN_FRONTEND noninteractive && DEBIAN_FRONTEND=noninteractive apt-get install -yq --no-install-recommends \
RUN apt-get install -yq --no-install-recommends \
ca-certificates \ ca-certificates \
openssh-server \ openssh-server \
wget wget \
apt-transport-https
# Download & Install GitLab # 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. # If you run GitLab Enterprise Edition point it to a location where you have downloaded it.
RUN TMP_FILE=$(mktemp); \ RUN echo "deb https://packages.gitlab.com/gitlab/gitlab-ce/ubuntu/ `lsb_release -cs` main" > /etc/apt/sources.list.d/gitlab_gitlab-ce.list
wget -q -O $TMP_FILE https://downloads-packages.s3.amazonaws.com/ubuntu-14.04/gitlab-ce_7.10.1~omnibus.2-1_amd64.deb \ RUN wget -q -O - https://packages.gitlab.com/gpg.key | apt-key add -
&& dpkg -i $TMP_FILE \ RUN apt-get update && apt-get install -yq --no-install-recommends gitlab-ce
&& rm -f $TMP_FILE
# Manage SSHD through runit # Manage SSHD through runit
RUN mkdir -p /opt/gitlab/sv/sshd/supervise \ RUN mkdir -p /opt/gitlab/sv/sshd/supervise \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment