diff options
| author | Rémy Coutable <remy@rymai.me> | 2018-10-16 12:44:49 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2018-10-16 12:44:49 +0000 |
| commit | e11ff3b6bc3700b93f4893903ff29c8914c70464 (patch) | |
| tree | d71c4a378b3804b2801e3bdf5df490fdb045ebdc | |
| parent | b69a047409d035aa69f8018cea2a86884e0530fd (diff) | |
| parent | 77f077b4cf49d1ab9a94e54c085367ade0b27cdd (diff) | |
| download | gitlab-ce-e11ff3b6bc3700b93f4893903ff29c8914c70464.tar.gz | |
Merge branch 'ashmckenzie/7516-update-qa-docker-image' into 'master'
Update git and install git-lfs QA docker image
See merge request gitlab-org/gitlab-ce!22355
| -rw-r--r-- | qa/Dockerfile | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/qa/Dockerfile b/qa/Dockerfile index abf2184e1e2..9956ced0ef6 100644 --- a/qa/Dockerfile +++ b/qa/Dockerfile @@ -3,10 +3,20 @@ LABEL maintainer "Grzegorz Bizon <grzegorz@gitlab.com>" ENV DEBIAN_FRONTEND noninteractive ## +# Add support for stretch-backports +# +RUN echo "deb http://ftp.debian.org/debian stretch-backports main" >> /etc/apt/sources.list + +## # Update APT sources and install some dependencies # RUN sed -i "s/httpredir.debian.org/ftp.us.debian.org/" /etc/apt/sources.list -RUN apt-get update && apt-get install -y wget git unzip xvfb +RUN apt-get update && apt-get install -y wget unzip xvfb + +## +# Install some packages from backports +# +RUN apt-get -y -t stretch-backports install git git-lfs ## # Install Docker |