summaryrefslogtreecommitdiff
path: root/qa
diff options
context:
space:
mode:
authorGrzegorz Bizon <grzesiek.bizon@gmail.com>2017-06-27 12:13:05 +0200
committerGrzegorz Bizon <grzesiek.bizon@gmail.com>2017-06-27 12:13:05 +0200
commitb3dd9e736a725d47d12224c3fefc283ed3018fd9 (patch)
tree88d74bbf4feed5269949a529c051a219e7a84b86 /qa
parenteacce60b1744775f4bb4c7dccfe29912d70b9984 (diff)
downloadgitlab-ce-b3dd9e736a725d47d12224c3fefc283ed3018fd9.tar.gz
Use latest chrome and chrome driver in GitLab QAfix/gb/qa/use-latest-chrome-version-in-qa-dockerfile
Diffstat (limited to 'qa')
-rw-r--r--qa/Dockerfile13
1 files changed, 3 insertions, 10 deletions
diff --git a/qa/Dockerfile b/qa/Dockerfile
index 97ae1961e34..f3a81a7e355 100644
--- a/qa/Dockerfile
+++ b/qa/Dockerfile
@@ -1,8 +1,6 @@
FROM ruby:2.3
LABEL maintainer "Grzegorz Bizon <grzegorz@gitlab.com>"
-
-ENV CHROME_VERSION 59.0.3071.109-1
-ENV CHROME_DRIVER_VERSION 2.30
+ENV DEBIAN_FRONTEND noninteractive
##
# Update APT sources and install some dependencies
@@ -15,22 +13,17 @@ RUN apt-get update && apt-get install -y wget git unzip xvfb
#
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 && DEBIAN_FRONTEND=noninteractive apt-get install -y google-chrome-stable=$CHROME_VERSION
+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/$CHROME_DRIVER_VERSION/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"]