From f736a03406e4e14b12f9d5d324d9b0b566a6514e Mon Sep 17 00:00:00 2001 From: Mike Greiling Date: Fri, 9 Jun 2017 20:23:18 +0000 Subject: [PATCH 1/5] Update Dockerfile to utilize the stable release of Google Chrome 59 --- qa/Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/qa/Dockerfile b/qa/Dockerfile index 9e2a74ef991..9146fc7e8be 100644 --- a/qa/Dockerfile +++ b/qa/Dockerfile @@ -8,10 +8,10 @@ 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 +# Google Chrome 59 is the first 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 wget -q https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_59.0.3071.86-1_amd64.deb +RUN dpkg -i google-chrome-stable_59.0.3071.86-1_amd64.deb; apt-get -fy install ## # Install chromedriver to make it work with Selenium From 59d940661fe939b169a2ab7c105f410b8d53c35d Mon Sep 17 00:00:00 2001 From: Mike Greiling Date: Mon, 19 Jun 2017 11:21:36 -0500 Subject: [PATCH 2/5] update chrome version and chromedriver --- qa/Dockerfile | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/qa/Dockerfile b/qa/Dockerfile index 9146fc7e8be..016dc5347bb 100644 --- a/qa/Dockerfile +++ b/qa/Dockerfile @@ -1,6 +1,9 @@ FROM ruby:2.3 LABEL maintainer "Grzegorz Bizon " +ENV CHROME_VERSION 59.0.3071.104-1 +ENV DRIVER_VERSION 2.30 + ## # Update APT sources and install some dependencies # @@ -8,15 +11,16 @@ 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 ## -# Google Chrome 59 is the first version with headless support +# Install Google Chrome version with headless support # -RUN wget -q https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_59.0.3071.86-1_amd64.deb -RUN dpkg -i google-chrome-stable_59.0.3071.86-1_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 && DEBIAN_FRONTEND=noninteractive apt-get install -y google-chrome-stable=$CHROME_VERSION ## # 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/$DRIVER_VERSION/chromedriver_linux64.zip RUN unzip chromedriver_linux64.zip -d /usr/local/bin RUN apt-get clean From bd12e1c85929c799885207f89ced4905184e3bb5 Mon Sep 17 00:00:00 2001 From: Mike Greiling Date: Wed, 21 Jun 2017 14:15:48 -0500 Subject: [PATCH 3/5] rename DRIVER_VERSION environment variable to CHROME_DRIVER_VERSION --- qa/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/qa/Dockerfile b/qa/Dockerfile index 016dc5347bb..6afb614cc62 100644 --- a/qa/Dockerfile +++ b/qa/Dockerfile @@ -2,7 +2,7 @@ FROM ruby:2.3 LABEL maintainer "Grzegorz Bizon " ENV CHROME_VERSION 59.0.3071.104-1 -ENV DRIVER_VERSION 2.30 +ENV CHROME_DRIVER_VERSION 2.30 ## # Update APT sources and install some dependencies @@ -20,7 +20,7 @@ RUN apt-get update -q && DEBIAN_FRONTEND=noninteractive apt-get install -y googl ## # Install chromedriver to make it work with Selenium # -RUN wget -q https://chromedriver.storage.googleapis.com/$DRIVER_VERSION/chromedriver_linux64.zip +RUN wget -q https://chromedriver.storage.googleapis.com/$CHROME_DRIVER_VERSION/chromedriver_linux64.zip RUN unzip chromedriver_linux64.zip -d /usr/local/bin RUN apt-get clean From bf0b233fc6bd107b08e203b601697bdee8503dcc Mon Sep 17 00:00:00 2001 From: Mike Greiling Date: Wed, 21 Jun 2017 14:17:28 -0500 Subject: [PATCH 4/5] add CHANGELOG.md entry for !12071 --- ...-dockerfile-now-that-chrome-headless-no-longer-in-beta.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 changelogs/unreleased/33538-update-ci-dockerfile-now-that-chrome-headless-no-longer-in-beta.yml diff --git a/changelogs/unreleased/33538-update-ci-dockerfile-now-that-chrome-headless-no-longer-in-beta.yml b/changelogs/unreleased/33538-update-ci-dockerfile-now-that-chrome-headless-no-longer-in-beta.yml new file mode 100644 index 00000000000..590472c0990 --- /dev/null +++ b/changelogs/unreleased/33538-update-ci-dockerfile-now-that-chrome-headless-no-longer-in-beta.yml @@ -0,0 +1,4 @@ +--- +title: Update QA Dockerfile to lock Chrome browser version +merge_request: 12071 +author: From 5981fff500d3671366d4a943aca69c6ef88b7e79 Mon Sep 17 00:00:00 2001 From: Grzegorz Bizon Date: Thu, 22 Jun 2017 13:51:47 +0200 Subject: [PATCH 5/5] Update chrome version and the binary path --- qa/Dockerfile | 2 +- qa/qa/specs/config.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/qa/Dockerfile b/qa/Dockerfile index 6afb614cc62..97ae1961e34 100644 --- a/qa/Dockerfile +++ b/qa/Dockerfile @@ -1,7 +1,7 @@ FROM ruby:2.3 LABEL maintainer "Grzegorz Bizon " -ENV CHROME_VERSION 59.0.3071.104-1 +ENV CHROME_VERSION 59.0.3071.109-1 ENV CHROME_DRIVER_VERSION 2.30 ## diff --git a/qa/qa/specs/config.rb b/qa/qa/specs/config.rb index 78a93828d36..b341aa3094a 100644 --- a/qa/qa/specs/config.rb +++ b/qa/qa/specs/config.rb @@ -55,7 +55,7 @@ module QA Capybara.register_driver :chrome do |app| capabilities = Selenium::WebDriver::Remote::Capabilities.chrome( 'chromeOptions' => { - 'binary' => '/opt/google/chrome-beta/google-chrome-beta', + 'binary' => '/usr/bin/google-chrome-stable', 'args' => %w[headless no-sandbox disable-gpu] } )