Skip to content

Commit 8dfb2ae

Browse files
committed
Config generation at runtime + buildtime
See SeleniumHQ#502 Generation at build time = default configuration file Generation at run time = allow to pass environment variables
1 parent 89d048c commit 8dfb2ae

File tree

6 files changed

+9
-5
lines changed

6 files changed

+9
-5
lines changed

NodeBase/entry_point.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
#!/bin/bash
22

33
source /opt/bin/functions.sh
4+
/opt/bin/generate_config > /opt/selenium/config.json
45

56
export GEOMETRY="$SCREEN_WIDTH""x""$SCREEN_HEIGHT""x""$SCREEN_DEPTH"
67

NodeChrome/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ USER seluser
3131
#==================
3232
# Chrome webdriver
3333
#==================
34-
ARG CHROME_DRIVER_VERSION=2.30
34+
ARG CHROME_DRIVER_VERSION=2.31
3535
RUN wget --no-verbose -O /tmp/chromedriver_linux64.zip https://chromedriver.storage.googleapis.com/$CHROME_DRIVER_VERSION/chromedriver_linux64.zip \
3636
&& rm -rf /opt/selenium/chromedriver \
3737
&& unzip /tmp/chromedriver_linux64.zip -d /opt/selenium \
@@ -47,5 +47,5 @@ COPY generate_config /opt/bin/generate_config
4747
#=================================
4848
COPY chrome_launcher.sh /opt/google/chrome/google-chrome
4949

50-
# Generating config inside the image rather than with entry_point.sh
50+
# Generating a default config during build time
5151
RUN /opt/bin/generate_config > /opt/selenium/config.json

NodeChromeDebug/entry_point.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
# IMPORTANT: Change this file only in directory NodeDebug!
44

55
source /opt/bin/functions.sh
6+
/opt/bin/generate_config > /opt/selenium/config.json
67

78
export GEOMETRY="$SCREEN_WIDTH""x""$SCREEN_HEIGHT""x""$SCREEN_DEPTH"
89

NodeDebug/entry_point.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
# IMPORTANT: Change this file only in directory NodeDebug!
44

55
source /opt/bin/functions.sh
6+
/opt/bin/generate_config > /opt/selenium/config.json
67

78
export GEOMETRY="$SCREEN_WIDTH""x""$SCREEN_HEIGHT""x""$SCREEN_DEPTH"
89

NodeFirefox/Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ USER root
1010
#=========
1111
# Firefox
1212
#=========
13-
ARG FIREFOX_VERSION=54.0
13+
ARG FIREFOX_VERSION=54.0.1
1414
RUN apt-get update -qqy \
1515
&& apt-get -qqy --no-install-recommends install firefox \
1616
&& rm -rf /var/lib/apt/lists/* /var/cache/apt/* \
@@ -25,7 +25,7 @@ RUN apt-get update -qqy \
2525
#============
2626
# GeckoDriver
2727
#============
28-
ARG GECKODRIVER_VERSION=0.17.0
28+
ARG GECKODRIVER_VERSION=0.18.0
2929
RUN wget --no-verbose -O /tmp/geckodriver.tar.gz https://github.com/mozilla/geckodriver/releases/download/v$GECKODRIVER_VERSION/geckodriver-v$GECKODRIVER_VERSION-linux64.tar.gz \
3030
&& rm -rf /opt/geckodriver \
3131
&& tar -C /opt -zxf /tmp/geckodriver.tar.gz \
@@ -43,5 +43,5 @@ COPY generate_config /opt/bin/generate_config
4343
# When logging into the container
4444
RUN sudo echo ""
4545

46-
# Generating config inside the image rather than with entry_point.sh
46+
# Generating a default config during build time
4747
RUN /opt/bin/generate_config > /opt/selenium/config.json

NodeFirefoxDebug/entry_point.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
# IMPORTANT: Change this file only in directory NodeDebug!
44

55
source /opt/bin/functions.sh
6+
/opt/bin/generate_config > /opt/selenium/config.json
67

78
export GEOMETRY="$SCREEN_WIDTH""x""$SCREEN_HEIGHT""x""$SCREEN_DEPTH"
89

0 commit comments

Comments
 (0)