diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-06-27 16:11:42 +0300 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-06-27 16:11:42 +0300 |
| commit | 823000b9be93a1c5085ad3b9f47b0cf747d2e624 (patch) | |
| tree | 2f0a6c225697e6d7664078749124df750eb85f5e | |
| parent | 99bdfd189bc9728444923b93fdd839ebe2b24eb5 (diff) | |
| parent | b3dd9e736a725d47d12224c3fefc283ed3018fd9 (diff) | |
Merge branch 'fix/gb/qa/use-latest-chrome-version-in-qa-dockerfile' into 'master'
Use latest chrome and chrome driver in GitLab QA
See merge request !12475
| -rw-r--r-- | qa/Dockerfile | 13 |
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"] |