Skip to content

Commit

Permalink
Moving config generation in docker files
Browse files Browse the repository at this point in the history 
This allow random users to launch the images.
The behavior is needed for OpenShift.
Cf. issue 3 from ddavison/selenium-openshift-templates
  • Loading branch information
@Remi-p
Remi-p committed Jun 15, 2017
1 parent bf36a08 commit 0dd193a
Show file tree
Hide file tree
Showing 8 changed files with 12 additions and 4 deletions.
1 change: 0 additions & 1 deletion NodeBase/entry_point.sh
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
#!/bin/bash

source /opt/bin/functions.sh
/opt/bin/generate_config > /opt/selenium/config.json

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

Expand Down
3 changes: 3 additions & 0 deletions NodeChrome/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,3 +46,6 @@ COPY generate_config /opt/bin/generate_config
# Chrome Launch Script Modification
#=================================
COPY chrome_launcher.sh /opt/google/chrome/google-chrome

# Generating config inside the image rather than with entry_point.sh
RUN /opt/bin/generate_config > /opt/selenium/config.json
3 changes: 3 additions & 0 deletions NodeChrome/Dockerfile.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,3 +39,6 @@ COPY generate_config /opt/bin/generate_config
# Chrome Launch Script Modification
#=================================
COPY chrome_launcher.sh /opt/google/chrome/google-chrome

# Generating config inside the image rather than with entry_point.sh
RUN /opt/bin/generate_config > /opt/selenium/config.json
1 change: 0 additions & 1 deletion NodeChromeDebug/entry_point.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
# IMPORTANT: Change this file only in directory NodeDebug!

source /opt/bin/functions.sh
/opt/bin/generate_config > /opt/selenium/config.json

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

Expand Down
1 change: 0 additions & 1 deletion NodeDebug/entry_point.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
# IMPORTANT: Change this file only in directory NodeDebug!

source /opt/bin/functions.sh
/opt/bin/generate_config > /opt/selenium/config.json

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

Expand Down
3 changes: 3 additions & 0 deletions NodeFirefox/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,3 +42,6 @@ COPY generate_config /opt/bin/generate_config
# To run a command as administrator (user "root"), use "sudo <command>". See "man sudo_root" for details.
# When logging into the container
RUN sudo echo ""

# Generating config inside the image rather than with entry_point.sh
RUN /opt/bin/generate_config > /opt/selenium/config.json
3 changes: 3 additions & 0 deletions NodeFirefox/Dockerfile.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,3 +35,6 @@ COPY generate_config /opt/bin/generate_config
# To run a command as administrator (user "root"), use "sudo <command>". See "man sudo_root" for details.
# When logging into the container
RUN sudo echo ""

# Generating config inside the image rather than with entry_point.sh
RUN /opt/bin/generate_config > /opt/selenium/config.json
1 change: 0 additions & 1 deletion NodeFirefoxDebug/entry_point.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
# IMPORTANT: Change this file only in directory NodeDebug!

source /opt/bin/functions.sh
/opt/bin/generate_config > /opt/selenium/config.json

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

Expand Down

1 comment on commit 0dd193a

@junhui
Copy link

@junhui junhui commented on 0dd193a Jul 28, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

what's the purpose for moving generate_config from container run time to image build time? this will have no way to pass environment information

Please sign in to comment.