From 84ac59f66abfb229fc2b09ca806ff2a7556fbeb1 Mon Sep 17 00:00:00 2001 From: Boni Garcia Date: Thu, 5 Jul 2018 11:41:09 +0200 Subject: [PATCH 1/2] Update chromedriver version to 2.40 --- docker/Emulator_arm | 4 ++-- docker/Emulator_x86 | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docker/Emulator_arm b/docker/Emulator_arm index 992c8c5..0d80661 100644 --- a/docker/Emulator_arm +++ b/docker/Emulator_arm @@ -91,11 +91,11 @@ RUN rm ${ANDROID_HOME}/tools/emulator \ ENV LD_LIBRARY_PATH=$ANDROID_HOME/emulator/lib64:$ANDROID_HOME/emulator/lib64/qt/lib #============================================== -# Download chrome driver v2.26 +# Download chrome driver # to be able to use chrome browser in emulator # Issue: https://github.com/butomo1989/docker-android/commit/6406504f944dae73d0a0c5d8e71a17a47dff9b33 #============================================== -RUN wget -nv -O chrome.zip "https://chromedriver.storage.googleapis.com/2.26/chromedriver_linux64.zip" \ +RUN wget -nv -O chrome.zip "https://chromedriver.storage.googleapis.com/2.40/chromedriver_linux64.zip" \ && unzip -x chrome.zip \ && rm chrome.zip diff --git a/docker/Emulator_x86 b/docker/Emulator_x86 index 67deacb..a7858f7 100644 --- a/docker/Emulator_x86 +++ b/docker/Emulator_x86 @@ -105,11 +105,11 @@ ENV LD_LIBRARY_PATH=$ANDROID_HOME/emulator/lib64:$ANDROID_HOME/emulator/lib64/qt #============================================== -# Download chrome driver v2.26 +# Download chrome driver # to be able to use chrome browser in emulator # Issue: https://github.com/butomo1989/docker-android/commit/6406504f944dae73d0a0c5d8e71a17a47dff9b33 #============================================== -RUN wget -nv -O chrome.zip "https://chromedriver.storage.googleapis.com/2.26/chromedriver_linux64.zip" \ +RUN wget -nv -O chrome.zip "https://chromedriver.storage.googleapis.com/2.40/chromedriver_linux64.zip" \ && unzip -x chrome.zip \ && rm chrome.zip From 1d7b7c2ac7eae6381f5f09a199031d3369e7bf90 Mon Sep 17 00:00:00 2001 From: Boni Garcia Date: Thu, 5 Jul 2018 12:56:10 +0200 Subject: [PATCH 2/2] Improve script to download latest version of chromedriver automatically --- docker/Emulator_arm | 8 ++++---- docker/Emulator_x86 | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/docker/Emulator_arm b/docker/Emulator_arm index 0d80661..9325c54 100644 --- a/docker/Emulator_arm +++ b/docker/Emulator_arm @@ -91,11 +91,11 @@ RUN rm ${ANDROID_HOME}/tools/emulator \ ENV LD_LIBRARY_PATH=$ANDROID_HOME/emulator/lib64:$ANDROID_HOME/emulator/lib64/qt/lib #============================================== -# Download chrome driver -# to be able to use chrome browser in emulator -# Issue: https://github.com/butomo1989/docker-android/commit/6406504f944dae73d0a0c5d8e71a17a47dff9b33 +# Download latest version of chromedriver +# to be able to use Chrome browser in emulator #============================================== -RUN wget -nv -O chrome.zip "https://chromedriver.storage.googleapis.com/2.40/chromedriver_linux64.zip" \ +RUN LATEST_VERSION=$(curl -s https://chromedriver.storage.googleapis.com/LATEST_RELEASE) \ + && wget -nv -O chrome.zip "https://chromedriver.storage.googleapis.com/$LATEST_VERSION/chromedriver_linux64.zip" \ && unzip -x chrome.zip \ && rm chrome.zip diff --git a/docker/Emulator_x86 b/docker/Emulator_x86 index a7858f7..ba8bb69 100644 --- a/docker/Emulator_x86 +++ b/docker/Emulator_x86 @@ -105,11 +105,11 @@ ENV LD_LIBRARY_PATH=$ANDROID_HOME/emulator/lib64:$ANDROID_HOME/emulator/lib64/qt #============================================== -# Download chrome driver -# to be able to use chrome browser in emulator -# Issue: https://github.com/butomo1989/docker-android/commit/6406504f944dae73d0a0c5d8e71a17a47dff9b33 +# Download latest version of chromedriver +# to be able to use Chrome browser in emulator #============================================== -RUN wget -nv -O chrome.zip "https://chromedriver.storage.googleapis.com/2.40/chromedriver_linux64.zip" \ +RUN LATEST_VERSION=$(curl -s https://chromedriver.storage.googleapis.com/LATEST_RELEASE) \ + && wget -nv -O chrome.zip "https://chromedriver.storage.googleapis.com/$LATEST_VERSION/chromedriver_linux64.zip" \ && unzip -x chrome.zip \ && rm chrome.zip