Skip to content

Commit 7c0d930

Browse files
ddavisonddavison
authored
Merge pull request SeleniumHQ#295 from SeleniumHQ/2.53.1-americium
2.53.1 americium
2 parents 4a07792 + 1883233 commit 7c0d930

File tree

20 files changed

+94
-61
lines changed

20 files changed

+94
-61
lines changed

‎Hub/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# NOTE: DO *NOT* EDIT THIS FILE. IT IS GENERATED.
33
# PLEASE UPDATE Dockerfile.txt INSTEAD OF THIS FILE
44
# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
5-
FROM selenium/base:2.53.1
5+
FROM selenium/base:2.53.1-americium
66
MAINTAINER Selenium <[email protected]>
77

88
#========================

‎Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ chrome: nodebase generate_chrome
4343
cd ./NodeChrome && docker build $(BUILD_ARGS) -t $(NAME)/node-chrome:$(VERSION) .
4444

4545
generate_firefox:
46-
cd ./NodeFirefox && ./generate.sh $(VERSION)
46+
cd ./NodeFirefox && ./generate.sh $(VERSION)
4747

4848
firefox: nodebase generate_firefox
4949
cd ./NodeFirefox && docker build $(BUILD_ARGS) -t $(NAME)/node-firefox:$(VERSION) .

‎NodeBase/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# NOTE: DO *NOT* EDIT THIS FILE. IT IS GENERATED.
33
# PLEASE UPDATE Dockerfile.txt INSTEAD OF THIS FILE
44
# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
5-
FROM selenium/base:2.53.1
5+
FROM selenium/base:2.53.1-americium
66
MAINTAINER Selenium <[email protected]>
77

88
ENV DEBIAN_FRONTEND noninteractive

‎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/selenium/generate_config > /opt/selenium/config.json
45

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

‎NodeChrome/Dockerfile

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# NOTE: DO *NOT* EDIT THIS FILE. IT IS GENERATED.
33
# PLEASE UPDATE Dockerfile.txt INSTEAD OF THIS FILE
44
# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
5-
FROM selenium/node-base:2.53.1
5+
FROM selenium/node-base:2.53.1-americium
66
MAINTAINER Selenium <[email protected]>
77

88
USER root
@@ -17,7 +17,7 @@ USER root
1717
# latest (equivalent to google-chrome-stable)
1818
# google-chrome-beta (pull latest beta)
1919
#============================================
20-
ENV CHROME_VERSION "google-chrome-stable"
20+
ARG CHROME_VERSION="google-chrome-stable"
2121
RUN wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add - \
2222
&& echo "deb http://dl.google.com/linux/chrome/deb/ stable main" >> /etc/apt/sources.list.d/google-chrome.list \
2323
&& apt-get update -qqy \
@@ -29,7 +29,7 @@ RUN wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key
2929
#==================
3030
# Chrome webdriver
3131
#==================
32-
ENV CHROME_DRIVER_VERSION 2.24
32+
ARG CHROME_DRIVER_VERSION=2.24
3333
RUN wget --no-verbose -O /tmp/chromedriver_linux64.zip https://chromedriver.storage.googleapis.com/$CHROME_DRIVER_VERSION/chromedriver_linux64.zip \
3434
&& rm -rf /opt/selenium/chromedriver \
3535
&& unzip /tmp/chromedriver_linux64.zip -d /opt/selenium \
@@ -41,14 +41,20 @@ RUN wget --no-verbose -O /tmp/chromedriver_linux64.zip https://chromedriver.stor
4141
#========================
4242
# Selenium Configuration
4343
#========================
44-
COPY config.json /opt/selenium/config.json
44+
ENV NODE_MAX_INSTANCES 1
45+
ENV NODE_MAX_SESSION 1
46+
ENV NODE_REGISTER_CYCLE 5000
47+
COPY generate_config /opt/selenium/generate_config
48+
RUN chmod +x /opt/selenium/generate_config
4549

4650
#=================================
4751
# Chrome Launch Script Modication
4852
#=================================
4953
COPY chrome_launcher.sh /opt/google/chrome/google-chrome
5054
RUN chmod +x /opt/google/chrome/google-chrome
5155

56+
RUN chown -R seluser:seluser /opt/selenium
57+
5258
USER seluser
5359
# Following line fixes
5460
# https://github.com/SeleniumHQ/docker-selenium/issues/87

‎NodeChrome/Dockerfile.txt

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ USER root
1212
# latest (equivalent to google-chrome-stable)
1313
# google-chrome-beta (pull latest beta)
1414
#============================================
15-
ENV CHROME_VERSION "google-chrome-stable"
15+
ARG CHROME_VERSION="google-chrome-stable"
1616
RUN wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add - \
1717
&& echo "deb http://dl.google.com/linux/chrome/deb/ stable main" >> /etc/apt/sources.list.d/google-chrome.list \
1818
&& apt-get update -qqy \
@@ -24,7 +24,7 @@ RUN wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key
2424
#==================
2525
# Chrome webdriver
2626
#==================
27-
ENV CHROME_DRIVER_VERSION 2.24
27+
ARG CHROME_DRIVER_VERSION=2.24
2828
RUN wget --no-verbose -O /tmp/chromedriver_linux64.zip https://chromedriver.storage.googleapis.com/$CHROME_DRIVER_VERSION/chromedriver_linux64.zip \
2929
&& rm -rf /opt/selenium/chromedriver \
3030
&& unzip /tmp/chromedriver_linux64.zip -d /opt/selenium \
@@ -36,14 +36,20 @@ RUN wget --no-verbose -O /tmp/chromedriver_linux64.zip https://chromedriver.stor
3636
#========================
3737
# Selenium Configuration
3838
#========================
39-
COPY config.json /opt/selenium/config.json
39+
ENV NODE_MAX_INSTANCES 1
40+
ENV NODE_MAX_SESSION 1
41+
ENV NODE_REGISTER_CYCLE 5000
42+
COPY generate_config /opt/selenium/generate_config
43+
RUN chmod +x /opt/selenium/generate_config
4044

4145
#=================================
4246
# Chrome Launch Script Modication
4347
#=================================
4448
COPY chrome_launcher.sh /opt/google/chrome/google-chrome
4549
RUN chmod +x /opt/google/chrome/google-chrome
4650

51+
RUN chown -R seluser:seluser /opt/selenium
52+
4753
USER seluser
4854
# Following line fixes
4955
# https://github.com/SeleniumHQ/docker-selenium/issues/87

‎NodeChrome/config.json

Lines changed: 0 additions & 21 deletions
This file was deleted.

‎NodeChrome/generate_config

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
#!/bin/bash
2+
3+
echo "
4+
{
5+
\"capabilities\": [
6+
{
7+
\"browserName\": \"*googlechrome\",
8+
\"maxInstances\": $NODE_MAX_INSTANCES,
9+
\"seleniumProtocol\": \"Selenium\"
10+
},
11+
{
12+
\"browserName\": \"chrome\",
13+
\"maxInstances\": $NODE_MAX_INSTANCES,
14+
\"seleniumProtocol\": \"WebDriver\"
15+
}
16+
],
17+
\"configuration\": {
18+
\"proxy\": \"org.openqa.grid.selenium.proxy.DefaultRemoteProxy\",
19+
\"maxSession\": $NODE_MAX_SESSION,
20+
\"port\": 5555,
21+
\"register\": true,
22+
\"registerCycle\": $NODE_REGISTER_CYCLE
23+
}
24+
}"
25+

‎NodeChromeDebug/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# NOTE: DO *NOT* EDIT THIS FILE. IT IS GENERATED.
33
# PLEASE UPDATE Dockerfile.txt INSTEAD OF THIS FILE
44
# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
5-
FROM selenium/node-chrome:2.53.1
5+
FROM selenium/node-chrome:2.53.1-americium
66
MAINTAINER Selenium <[email protected]>
77

88
USER root

‎NodeChromeDebug/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/selenium/generate_config > /opt/selenium/config.json
45

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

‎NodeFirefox/Dockerfile

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# NOTE: DO *NOT* EDIT THIS FILE. IT IS GENERATED.
33
# PLEASE UPDATE Dockerfile.txt INSTEAD OF THIS FILE
44
# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
5-
FROM selenium/node-base:2.53.1
5+
FROM selenium/node-base:2.53.1-americium
66
MAINTAINER Selenium <[email protected]>
77

88
USER root
@@ -38,6 +38,11 @@ RUN wget --no-verbose -O /tmp/geckodriver.tar.gz https://github.com/mozilla/geck
3838
#========================
3939
# Selenium Configuration
4040
#========================
41-
COPY config.json /opt/selenium/config.json
41+
ENV NODE_MAX_INSTANCES 1
42+
ENV NODE_MAX_SESSION 1
43+
ENV NODE_REGISTER_CYCLE 5000
44+
COPY generate_config /opt/selenium/generate_config
45+
RUN chmod +x /opt/selenium/generate_config \
46+
&& chown -R seluser:seluser /opt/selenium
4247

4348
USER seluser

‎NodeFirefox/Dockerfile.txt

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,11 @@ RUN wget --no-verbose -O /tmp/geckodriver.tar.gz https://github.com/mozilla/geck
3333
#========================
3434
# Selenium Configuration
3535
#========================
36-
COPY config.json /opt/selenium/config.json
36+
ENV NODE_MAX_INSTANCES 1
37+
ENV NODE_MAX_SESSION 1
38+
ENV NODE_REGISTER_CYCLE 5000
39+
COPY generate_config /opt/selenium/generate_config
40+
RUN chmod +x /opt/selenium/generate_config \
41+
&& chown -R seluser:seluser /opt/selenium
3742

3843
USER seluser

‎NodeFirefox/config.json

Lines changed: 0 additions & 21 deletions
This file was deleted.

‎NodeFirefox/generate_config

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
#!/bin/bash
2+
3+
echo "
4+
{
5+
\"capabilities\": [
6+
{
7+
\"browserName\": \"*firefox\",
8+
\"maxInstances\": $NODE_MAX_INSTANCES,
9+
\"seleniumProtocol\": \"Selenium\"
10+
},
11+
{
12+
\"browserName\": \"firefox\",
13+
\"maxInstances\": $NODE_MAX_INSTANCES,
14+
\"seleniumProtocol\": \"WebDriver\"
15+
}
16+
],
17+
\"configuration\": {
18+
\"proxy\": \"org.openqa.grid.selenium.proxy.DefaultRemoteProxy\",
19+
\"maxSession\": $NODE_MAX_SESSION,
20+
\"port\": 5555,
21+
\"register\": true,
22+
\"registerCycle\": $NODE_REGISTER_CYCLE
23+
}
24+
}"
25+

‎NodeFirefoxDebug/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# NOTE: DO *NOT* EDIT THIS FILE. IT IS GENERATED.
33
# PLEASE UPDATE Dockerfile.txt INSTEAD OF THIS FILE
44
# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
5-
FROM selenium/node-firefox:2.53.1
5+
FROM selenium/node-firefox:2.53.1-americium
66
MAINTAINER Selenium <[email protected]>
77

88
USER root

‎NodeFirefoxDebug/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/selenium/generate_config > /opt/selenium/config.json
45

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

‎StandaloneChrome/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# NOTE: DO *NOT* EDIT THIS FILE. IT IS GENERATED.
33
# PLEASE UPDATE Dockerfile.txt INSTEAD OF THIS FILE
44
# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
5-
FROM selenium/node-chrome:2.53.1
5+
FROM selenium/node-chrome:2.53.1-americium
66
MAINTAINER Selenium <[email protected]>
77

88
USER root

‎StandaloneChromeDebug/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# NOTE: DO *NOT* EDIT THIS FILE. IT IS GENERATED.
33
# PLEASE UPDATE Dockerfile.txt INSTEAD OF THIS FILE
44
# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
5-
FROM selenium/standalone-chrome:2.53.1
5+
FROM selenium/standalone-chrome:2.53.1-americium
66
MAINTAINER Selenium <[email protected]>
77

88
USER root

‎StandaloneFirefox/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# NOTE: DO *NOT* EDIT THIS FILE. IT IS GENERATED.
33
# PLEASE UPDATE Dockerfile.txt INSTEAD OF THIS FILE
44
# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
5-
FROM selenium/node-firefox:2.53.1
5+
FROM selenium/node-firefox:2.53.1-americium
66
MAINTAINER Selenium <[email protected]>
77

88
USER root

‎StandaloneFirefoxDebug/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# NOTE: DO *NOT* EDIT THIS FILE. IT IS GENERATED.
33
# PLEASE UPDATE Dockerfile.txt INSTEAD OF THIS FILE
44
# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
5-
FROM selenium/standalone-firefox:2.53.1
5+
FROM selenium/standalone-firefox:2.53.1-americium
66
MAINTAINER Selenium <[email protected]>
77

88
USER root

0 commit comments

Comments
 (0)