diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-11-20 15:53:01 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-11-20 15:53:01 +0000 |
| commit | 09309d78bc4148968b0f3870a6bcf5d40ab0cbf6 (patch) | |
| tree | 9dcc3d7e9067841a7642afa222aa81b04a670277 | |
| parent | 4b78f70fc4c9b7f807db497e4ced12a92744bc3e (diff) | |
| parent | 65bb2575d8657e02d15e2d9f3abcaca3814afa0d (diff) | |
| download | gitlab-ce-09309d78bc4148968b0f3870a6bcf5d40ab0cbf6.tar.gz | |
Merge branch 'qa/gb/add-docker-to-qa-image' into 'master'
Add Docker binaries to instance image of GitLab QA
See merge request gitlab-org/gitlab-ce!15489
| -rw-r--r-- | qa/Dockerfile | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/qa/Dockerfile b/qa/Dockerfile index f3a81a7e355..9b6ffff7c4d 100644 --- a/qa/Dockerfile +++ b/qa/Dockerfile @@ -9,6 +9,13 @@ 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 ## +# Install Docker +# +RUN wget -q https://download.docker.com/linux/static/stable/x86_64/docker-17.09.0-ce.tgz && \ + tar -zxf docker-17.09.0-ce.tgz && mv docker/docker /usr/local/bin/docker && \ + rm docker-17.09.0-ce.tgz + +## # Install Google Chrome version with headless support # RUN curl -sS -L https://dl.google.com/linux/linux_signing_key.pub | apt-key add - |