summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGrzegorz Bizon <grzesiek.bizon@gmail.com>2017-11-20 16:21:52 +0100
committerGrzegorz Bizon <grzesiek.bizon@gmail.com>2017-11-20 16:21:52 +0100
commit65bb2575d8657e02d15e2d9f3abcaca3814afa0d (patch)
tree2f82274da6dcef54ce8a202ac64486f04e01ba35
parentbd026b6a28ac410ad455b7b915cafc9782296b6b (diff)
downloadgitlab-ce-65bb2575d8657e02d15e2d9f3abcaca3814afa0d.tar.gz
Add Docker binaries to instance image of GitLab QA
-rw-r--r--qa/Dockerfile7
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 -