diff options
| author | Stan Hu <stanhu@gmail.com> | 2017-08-02 16:58:28 -0700 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2017-08-02 16:58:28 -0700 |
| commit | 408df2edcbd5f3f93ef5541bac9de2b71ba4f0ea (patch) | |
| tree | 708ae61f9683b48f436f7577d1fad98f30e100fc /qa/Dockerfile | |
| parent | 3f81586ef0ab20533b8da1213bd9f60e1786dbaa (diff) | |
| parent | faa2a123911eaf84bb57163ea7af759d4632601b (diff) | |
| download | gitlab-ce-408df2edcbd5f3f93ef5541bac9de2b71ba4f0ea.tar.gz | |
Merge branch 'master' into sh-headless-chrome-support
Diffstat (limited to 'qa/Dockerfile')
| -rw-r--r-- | qa/Dockerfile | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/qa/Dockerfile b/qa/Dockerfile index 9e2a74ef991..f3a81a7e355 100644 --- a/qa/Dockerfile +++ b/qa/Dockerfile @@ -1,5 +1,6 @@ FROM ruby:2.3 LABEL maintainer "Grzegorz Bizon <grzegorz@gitlab.com>" +ENV DEBIAN_FRONTEND noninteractive ## # Update APT sources and install some dependencies @@ -8,25 +9,21 @@ 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 ## -# At this point Google Chrome Beta is 59 - first version with headless support +# Install Google Chrome version with headless support # -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 +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 ## # Install chromedriver to make it work with Selenium # -RUN wget -q https://chromedriver.storage.googleapis.com/2.29/chromedriver_linux64.zip +RUN wget -q https://chromedriver.storage.googleapis.com/$(wget -q -O - https://chromedriver.storage.googleapis.com/LATEST_RELEASE)/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"] |