From eeee14338fccfad363e3fa9d8dc55e15de8507a9 Mon Sep 17 00:00:00 2001 From: Taufek Johar Date: Fri, 6 Oct 2017 22:46:54 +0800 Subject: [PATCH] Move Chrome Driver Version to Env This will allow us to upgrade chrome driver easily. Set the default chrome driver to 2.32. Also remove the comment and empty line to avoid getting below warning: ``` [WARNING]: Empty continuation lines will become errors in a future release. ``` --- docker-compose.yml | 1 + env-example | 1 + workspace/Dockerfile-71 | 9 +++------ 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 75c848f0..e0fee7de 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -43,6 +43,7 @@ services: - INSTALL_DUSK_DEPS=${WORKSPACE_INSTALL_DUSK_DEPS} - PUID=${WORKSPACE_PUID} - PGID=${WORKSPACE_PGID} + - CHROME_DRIVER_VERSION=${WORKSPACE_CHROME_DRIVER_VERSION} - NODE_VERSION=${WORKSPACE_NODE_VERSION} - YARN_VERSION=${WORKSPACE_YARN_VERSION} - TZ=${WORKSPACE_TIMEZONE} diff --git a/env-example b/env-example index 33c773e2..0fe6ddb8 100644 --- a/env-example +++ b/env-example @@ -56,6 +56,7 @@ WORKSPACE_INSTALL_TERRAFORM=false WORKSPACE_INSTALL_DUSK_DEPS=false WORKSPACE_PUID=1000 WORKSPACE_PGID=1000 +WORKSPACE_CHROME_DRIVER_VERSION=2.32 WORKSPACE_NODE_VERSION=stable WORKSPACE_YARN_VERSION=latest WORKSPACE_TIMEZONE=UTC diff --git a/workspace/Dockerfile-71 b/workspace/Dockerfile-71 index 533b72f7..ac47e4e6 100644 --- a/workspace/Dockerfile-71 +++ b/workspace/Dockerfile-71 @@ -628,26 +628,23 @@ RUN if [ ${INSTALL_TERRAFORM} = true ]; then \ # Dusk Dependencies: ##################################### USER root +ARG CHROME_DRIVER_VERSION=stable +ENV CHROME_DRIVER_VERSION ${CHROME_DRIVER_VERSION} ARG INSTALL_DUSK_DEPS=false ENV INSTALL_DUSK_DEPS ${INSTALL_DUSK_DEPS} RUN if [ ${INSTALL_DUSK_DEPS} = true ]; then \ - # Install required packages add-apt-repository ppa:ondrej/php \ && apt-get update \ && apt-get -y install zip wget unzip xdg-utils \ libxpm4 libxrender1 libgtk2.0-0 libnss3 libgconf-2-4 xvfb \ gtk2-engines-pixbuf xfonts-cyrillic xfonts-100dpi xfonts-75dpi \ xfonts-base xfonts-scalable x11-apps \ - - # Install Google Chrome && wget https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb \ && dpkg -i --force-depends google-chrome-stable_current_amd64.deb \ && apt-get -y -f install \ && dpkg -i --force-depends google-chrome-stable_current_amd64.deb \ && rm google-chrome-stable_current_amd64.deb \ - - # Install Chrome Driver - && wget https://chromedriver.storage.googleapis.com/2.31/chromedriver_linux64.zip \ + && wget https://chromedriver.storage.googleapis.com/${CHROME_DRIVER_VERSION}/chromedriver_linux64.zip \ && unzip chromedriver_linux64.zip \ && mv chromedriver /usr/local/bin/ \ && rm chromedriver_linux64.zip \