Skip to content

Commit 7500387

Browse files
mkreidiemol
authored andcommitted
Derive Chromedriver version to install from used Chrome (#885) (#886)
* derived Chromedriver version to install from used Chrome * restore chromedriver version overwrite
1 parent d071ce3 commit 7500387

File tree

2 files changed

+22
-4
lines changed

2 files changed

+22
-4
lines changed

NodeChrome/Dockerfile

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,17 @@ USER seluser
4040
# can specify versions by CHROME_DRIVER_VERSION
4141
# Latest released version will be used by default
4242
#============================================
43-
ARG CHROME_DRIVER_VERSION="73.0.3683.68"
44-
RUN CD_VERSION=$(echo $CHROME_DRIVER_VERSION) \
43+
ARG CHROME_DRIVER_VERSION
44+
RUN CHROME_STRING=$(google-chrome --version) \
45+
&& CHROME_VERSION_STRING=$(echo "${CHROME_STRING}" | grep -oP "\d+\.\d+\.\d+\.\d+") \
46+
&& CHROME_MAYOR_VERSION=$(echo "${CHROME_VERSION_STRING%%.*}") \
47+
&& wget --no-verbose -O /tmp/LATEST_RELEASE "https://chromedriver.storage.googleapis.com/LATEST_RELEASE_${CHROME_MAYOR_VERSION}" \
48+
&& CD_VERSION=$(cat "/tmp/LATEST_RELEASE") \
49+
&& rm /tmp/LATEST_RELEASE \
50+
&& if [ -z "$CHROME_DRIVER_VERSION" ]; \
51+
then CHROME_DRIVER_VERSION="${CD_VERSION}"; \
52+
fi \
53+
&& CD_VERSION=$(echo $CHROME_DRIVER_VERSION) \
4554
&& echo "Using chromedriver version: "$CD_VERSION \
4655
&& wget --no-verbose -O /tmp/chromedriver_linux64.zip https://chromedriver.storage.googleapis.com/$CD_VERSION/chromedriver_linux64.zip \
4756
&& rm -rf /opt/selenium/chromedriver \

NodeChrome/Dockerfile.txt

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,17 @@ USER seluser
3333
# can specify versions by CHROME_DRIVER_VERSION
3434
# Latest released version will be used by default
3535
#============================================
36-
ARG CHROME_DRIVER_VERSION="73.0.3683.68"
37-
RUN CD_VERSION=$(echo $CHROME_DRIVER_VERSION) \
36+
ARG CHROME_DRIVER_VERSION
37+
RUN CHROME_STRING=$(google-chrome --version) \
38+
&& CHROME_VERSION_STRING=$(echo "${CHROME_STRING}" | grep -oP "\d+\.\d+\.\d+\.\d+") \
39+
&& CHROME_MAYOR_VERSION=$(echo "${CHROME_VERSION_STRING%%.*}") \
40+
&& wget --no-verbose -O /tmp/LATEST_RELEASE "https://chromedriver.storage.googleapis.com/LATEST_RELEASE_${CHROME_MAYOR_VERSION}" \
41+
&& CD_VERSION=$(cat "/tmp/LATEST_RELEASE") \
42+
&& rm /tmp/LATEST_RELEASE \
43+
&& if [ -z "$CHROME_DRIVER_VERSION" ]; \
44+
then CHROME_DRIVER_VERSION="${CD_VERSION}"; \
45+
fi \
46+
&& CD_VERSION=$(echo $CHROME_DRIVER_VERSION) \
3847
&& echo "Using chromedriver version: "$CD_VERSION \
3948
&& wget --no-verbose -O /tmp/chromedriver_linux64.zip https://chromedriver.storage.googleapis.com/$CD_VERSION/chromedriver_linux64.zip \
4049
&& rm -rf /opt/selenium/chromedriver \

0 commit comments

Comments
 (0)