Commit 09309d78 authored by Rémy Coutable's avatar Rémy Coutable

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
parents 4b78f70f 65bb2575
......@@ -8,6 +8,13 @@ ENV DEBIAN_FRONTEND noninteractive
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
#
......
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