Skip to content

Commit 0dd193a

Browse files
committed
Moving config generation in docker files
This allow random users to launch the images. The behavior is needed for OpenShift. Cf. issue 3 from ddavison/selenium-openshift-templates
1 parent bf36a08 commit 0dd193a

File tree

8 files changed

+12
-4
lines changed

8 files changed

+12
-4
lines changed

NodeBase/entry_point.sh

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

33
source /opt/bin/functions.sh
4-
/opt/bin/generate_config > /opt/selenium/config.json
54

65
export GEOMETRY="$SCREEN_WIDTH""x""$SCREEN_HEIGHT""x""$SCREEN_DEPTH"
76

NodeChrome/Dockerfile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,3 +46,6 @@ COPY generate_config /opt/bin/generate_config
4646
# Chrome Launch Script Modification
4747
#=================================
4848
COPY chrome_launcher.sh /opt/google/chrome/google-chrome
49+
50+
# Generating config inside the image rather than with entry_point.sh
51+
RUN /opt/bin/generate_config > /opt/selenium/config.json

NodeChrome/Dockerfile.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,3 +39,6 @@ COPY generate_config /opt/bin/generate_config
3939
# Chrome Launch Script Modification
4040
#=================================
4141
COPY chrome_launcher.sh /opt/google/chrome/google-chrome
42+
43+
# Generating config inside the image rather than with entry_point.sh
44+
RUN /opt/bin/generate_config > /opt/selenium/config.json

NodeChromeDebug/entry_point.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
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
76

87
export GEOMETRY="$SCREEN_WIDTH""x""$SCREEN_HEIGHT""x""$SCREEN_DEPTH"
98

NodeDebug/entry_point.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
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
76

87
export GEOMETRY="$SCREEN_WIDTH""x""$SCREEN_HEIGHT""x""$SCREEN_DEPTH"
98

NodeFirefox/Dockerfile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,3 +42,6 @@ COPY generate_config /opt/bin/generate_config
4242
# To run a command as administrator (user "root"), use "sudo <command>". See "man sudo_root" for details.
4343
# When logging into the container
4444
RUN sudo echo ""
45+
46+
# Generating config inside the image rather than with entry_point.sh
47+
RUN /opt/bin/generate_config > /opt/selenium/config.json

NodeFirefox/Dockerfile.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,3 +35,6 @@ COPY generate_config /opt/bin/generate_config
3535
# To run a command as administrator (user "root"), use "sudo <command>". See "man sudo_root" for details.
3636
# When logging into the container
3737
RUN sudo echo ""
38+
39+
# Generating config inside the image rather than with entry_point.sh
40+
RUN /opt/bin/generate_config > /opt/selenium/config.json

NodeFirefoxDebug/entry_point.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
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
76

87
export GEOMETRY="$SCREEN_WIDTH""x""$SCREEN_HEIGHT""x""$SCREEN_DEPTH"
98

0 commit comments

Comments
 (0)