diff options
author | James Edwards-Jones <jedwardsjones@gitlab.com> | 2017-07-04 21:26:57 +0100 |
---|---|---|
committer | James Edwards-Jones <jedwardsjones@gitlab.com> | 2017-07-04 21:26:57 +0100 |
commit | 55fe1fc927a26e3821e1369ab85ee1e6697878ae (patch) | |
tree | d96c32b11ead6deabedec7540144d6a70bb26513 | |
parent | 6c9a36667e4ecba378df7cd2a803a215caa0fa0f (diff) | |
download | gitlab-ce-55fe1fc927a26e3821e1369ab85ee1e6697878ae.tar.gz |
Revert "Merge branch 'fix/gb/qa/use-latest-chrome-version-in-qa-dockerfile' into 'master'"
This reverts commit 9b0e44bf1f0b924d87802a3f5ecf6df3fdeb72a7.
-rw-r--r-- | qa/Dockerfile | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/qa/Dockerfile b/qa/Dockerfile index f3a81a7e355..9e2a74ef991 100644 --- a/qa/Dockerfile +++ b/qa/Dockerfile @@ -1,6 +1,5 @@ FROM ruby:2.3 LABEL maintainer "Grzegorz Bizon <grzegorz@gitlab.com>" -ENV DEBIAN_FRONTEND noninteractive ## # Update APT sources and install some dependencies @@ -9,21 +8,25 @@ 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 Google Chrome version with headless support +# At this point Google Chrome Beta is 59 - first version with headless support # -RUN curl -sS -L https://dl.google.com/linux/linux_signing_key.pub | apt-key add - -RUN echo "deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main" > /etc/apt/sources.list.d/google.list -RUN apt-get update -q && apt-get install -y google-chrome-stable && apt-get clean +RUN wget -q https://dl.google.com/linux/direct/google-chrome-beta_current_amd64.deb +RUN dpkg -i google-chrome-beta_current_amd64.deb; apt-get -fy install ## # Install chromedriver to make it work with Selenium # -RUN wget -q https://chromedriver.storage.googleapis.com/$(wget -q -O - https://chromedriver.storage.googleapis.com/LATEST_RELEASE)/chromedriver_linux64.zip +RUN wget -q https://chromedriver.storage.googleapis.com/2.29/chromedriver_linux64.zip RUN unzip chromedriver_linux64.zip -d /usr/local/bin +RUN apt-get clean + WORKDIR /home/qa + COPY ./Gemfile* ./ + RUN bundle install + COPY ./ ./ ENTRYPOINT ["bin/test"] |