Skip to content

2.53.1 americium #295

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 7, 2016
Merged

2.53.1 americium #295

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e423b4b
americium pre-check
ddavison Oct 7, 2016
1883233
let firefox specify node instances
ddavison Oct 7, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Hub/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# NOTE: DO *NOT* EDIT THIS FILE. IT IS GENERATED.
# PLEASE UPDATE Dockerfile.txt INSTEAD OF THIS FILE
# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
FROM selenium/base:2.53.1
FROM selenium/base:2.53.1-americium
MAINTAINER Selenium <selenium-developers@googlegroups.com>

#========================
Expand Down
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ chrome: nodebase generate_chrome
cd ./NodeChrome && docker build $(BUILD_ARGS) -t $(NAME)/node-chrome:$(VERSION) .

generate_firefox:
cd ./NodeFirefox && ./generate.sh $(VERSION)
cd ./NodeFirefox && ./generate.sh $(VERSION)

firefox: nodebase generate_firefox
cd ./NodeFirefox && docker build $(BUILD_ARGS) -t $(NAME)/node-firefox:$(VERSION) .
Expand Down
2 changes: 1 addition & 1 deletion NodeBase/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# NOTE: DO *NOT* EDIT THIS FILE. IT IS GENERATED.
# PLEASE UPDATE Dockerfile.txt INSTEAD OF THIS FILE
# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
FROM selenium/base:2.53.1
FROM selenium/base:2.53.1-americium
MAINTAINER Selenium <selenium-developers@googlegroups.com>

ENV DEBIAN_FRONTEND noninteractive
Expand Down
1 change: 1 addition & 0 deletions NodeBase/entry_point.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#!/bin/bash

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

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

Expand Down
14 changes: 10 additions & 4 deletions NodeChrome/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# NOTE: DO *NOT* EDIT THIS FILE. IT IS GENERATED.
# PLEASE UPDATE Dockerfile.txt INSTEAD OF THIS FILE
# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
FROM selenium/node-base:2.53.1
FROM selenium/node-base:2.53.1-americium
MAINTAINER Selenium <selenium-developers@googlegroups.com>

USER root
Expand All @@ -17,7 +17,7 @@ USER root
# latest (equivalent to google-chrome-stable)
# google-chrome-beta (pull latest beta)
#============================================
ENV CHROME_VERSION "google-chrome-stable"
ARG CHROME_VERSION="google-chrome-stable"
RUN wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add - \
&& echo "deb http://dl.google.com/linux/chrome/deb/ stable main" >> /etc/apt/sources.list.d/google-chrome.list \
&& apt-get update -qqy \
Expand All @@ -29,7 +29,7 @@ RUN wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key
#==================
# Chrome webdriver
#==================
ENV CHROME_DRIVER_VERSION 2.24
ARG CHROME_DRIVER_VERSION=2.24
RUN wget --no-verbose -O /tmp/chromedriver_linux64.zip https://chromedriver.storage.googleapis.com/$CHROME_DRIVER_VERSION/chromedriver_linux64.zip \
&& rm -rf /opt/selenium/chromedriver \
&& unzip /tmp/chromedriver_linux64.zip -d /opt/selenium \
Expand All @@ -41,14 +41,20 @@ RUN wget --no-verbose -O /tmp/chromedriver_linux64.zip https://chromedriver.stor
#========================
# Selenium Configuration
#========================
COPY config.json /opt/selenium/config.json
ENV NODE_MAX_INSTANCES 1
ENV NODE_MAX_SESSION 1
ENV NODE_REGISTER_CYCLE 5000
COPY generate_config /opt/selenium/generate_config
RUN chmod +x /opt/selenium/generate_config

#=================================
# Chrome Launch Script Modication
#=================================
COPY chrome_launcher.sh /opt/google/chrome/google-chrome
RUN chmod +x /opt/google/chrome/google-chrome

RUN chown -R seluser:seluser /opt/selenium

USER seluser
# Following line fixes
# https://github.com/SeleniumHQ/docker-selenium/issues/87
Expand Down
12 changes: 9 additions & 3 deletions NodeChrome/Dockerfile.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ USER root
# latest (equivalent to google-chrome-stable)
# google-chrome-beta (pull latest beta)
#============================================
ENV CHROME_VERSION "google-chrome-stable"
ARG CHROME_VERSION="google-chrome-stable"
RUN wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add - \
&& echo "deb http://dl.google.com/linux/chrome/deb/ stable main" >> /etc/apt/sources.list.d/google-chrome.list \
&& apt-get update -qqy \
Expand All @@ -24,7 +24,7 @@ RUN wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key
#==================
# Chrome webdriver
#==================
ENV CHROME_DRIVER_VERSION 2.24
ARG CHROME_DRIVER_VERSION=2.24
RUN wget --no-verbose -O /tmp/chromedriver_linux64.zip https://chromedriver.storage.googleapis.com/$CHROME_DRIVER_VERSION/chromedriver_linux64.zip \
&& rm -rf /opt/selenium/chromedriver \
&& unzip /tmp/chromedriver_linux64.zip -d /opt/selenium \
Expand All @@ -36,14 +36,20 @@ RUN wget --no-verbose -O /tmp/chromedriver_linux64.zip https://chromedriver.stor
#========================
# Selenium Configuration
#========================
COPY config.json /opt/selenium/config.json
ENV NODE_MAX_INSTANCES 1
ENV NODE_MAX_SESSION 1
ENV NODE_REGISTER_CYCLE 5000
COPY generate_config /opt/selenium/generate_config
RUN chmod +x /opt/selenium/generate_config

#=================================
# Chrome Launch Script Modication
#=================================
COPY chrome_launcher.sh /opt/google/chrome/google-chrome
RUN chmod +x /opt/google/chrome/google-chrome

RUN chown -R seluser:seluser /opt/selenium

USER seluser
# Following line fixes
# https://github.com/SeleniumHQ/docker-selenium/issues/87
Expand Down
21 changes: 0 additions & 21 deletions NodeChrome/config.json
View file
Open in desktop

This file was deleted.

25 changes: 25 additions & 0 deletions NodeChrome/generate_config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
#!/bin/bash

echo "
{
\"capabilities\": [
{
\"browserName\": \"*googlechrome\",
\"maxInstances\": $NODE_MAX_INSTANCES,
\"seleniumProtocol\": \"Selenium\"
},
{
\"browserName\": \"chrome\",
\"maxInstances\": $NODE_MAX_INSTANCES,
\"seleniumProtocol\": \"WebDriver\"
}
],
\"configuration\": {
\"proxy\": \"org.openqa.grid.selenium.proxy.DefaultRemoteProxy\",
\"maxSession\": $NODE_MAX_SESSION,
\"port\": 5555,
\"register\": true,
\"registerCycle\": $NODE_REGISTER_CYCLE
}
}"

2 changes: 1 addition & 1 deletion NodeChromeDebug/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# NOTE: DO *NOT* EDIT THIS FILE. IT IS GENERATED.
# PLEASE UPDATE Dockerfile.txt INSTEAD OF THIS FILE
# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
FROM selenium/node-chrome:2.53.1
FROM selenium/node-chrome:2.53.1-americium
MAINTAINER Selenium <selenium-developers@googlegroups.com>

USER root
Expand Down
1 change: 1 addition & 0 deletions NodeChromeDebug/entry_point.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#!/bin/bash

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

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

Expand Down
9 changes: 7 additions & 2 deletions NodeFirefox/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# NOTE: DO *NOT* EDIT THIS FILE. IT IS GENERATED.
# PLEASE UPDATE Dockerfile.txt INSTEAD OF THIS FILE
# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
FROM selenium/node-base:2.53.1
FROM selenium/node-base:2.53.1-americium
MAINTAINER Selenium <selenium-developers@googlegroups.com>

USER root
Expand Down Expand Up @@ -38,6 +38,11 @@ RUN wget --no-verbose -O /tmp/geckodriver.tar.gz https://github.com/mozilla/geck
#========================
# Selenium Configuration
#========================
COPY config.json /opt/selenium/config.json
ENV NODE_MAX_INSTANCES 1
ENV NODE_MAX_SESSION 1
ENV NODE_REGISTER_CYCLE 5000
COPY generate_config /opt/selenium/generate_config
RUN chmod +x /opt/selenium/generate_config \
&& chown -R seluser:seluser /opt/selenium

USER seluser
7 changes: 6 additions & 1 deletion NodeFirefox/Dockerfile.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,11 @@ RUN wget --no-verbose -O /tmp/geckodriver.tar.gz https://github.com/mozilla/geck
#========================
# Selenium Configuration
#========================
COPY config.json /opt/selenium/config.json
ENV NODE_MAX_INSTANCES 1
ENV NODE_MAX_SESSION 1
ENV NODE_REGISTER_CYCLE 5000
COPY generate_config /opt/selenium/generate_config
RUN chmod +x /opt/selenium/generate_config \
&& chown -R seluser:seluser /opt/selenium

USER seluser
21 changes: 0 additions & 21 deletions NodeFirefox/config.json
View file
Open in desktop

This file was deleted.

25 changes: 25 additions & 0 deletions NodeFirefox/generate_config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
#!/bin/bash

echo "
{
\"capabilities\": [
{
\"browserName\": \"*firefox\",
\"maxInstances\": $NODE_MAX_INSTANCES,
\"seleniumProtocol\": \"Selenium\"
},
{
\"browserName\": \"firefox\",
\"maxInstances\": $NODE_MAX_INSTANCES,
\"seleniumProtocol\": \"WebDriver\"
}
],
\"configuration\": {
\"proxy\": \"org.openqa.grid.selenium.proxy.DefaultRemoteProxy\",
\"maxSession\": $NODE_MAX_SESSION,
\"port\": 5555,
\"register\": true,
\"registerCycle\": $NODE_REGISTER_CYCLE
}
}"

2 changes: 1 addition & 1 deletion NodeFirefoxDebug/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# NOTE: DO *NOT* EDIT THIS FILE. IT IS GENERATED.
# PLEASE UPDATE Dockerfile.txt INSTEAD OF THIS FILE
# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
FROM selenium/node-firefox:2.53.1
FROM selenium/node-firefox:2.53.1-americium
MAINTAINER Selenium <selenium-developers@googlegroups.com>

USER root
Expand Down
1 change: 1 addition & 0 deletions NodeFirefoxDebug/entry_point.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#!/bin/bash

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

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

Expand Down
2 changes: 1 addition & 1 deletion StandaloneChrome/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# NOTE: DO *NOT* EDIT THIS FILE. IT IS GENERATED.
# PLEASE UPDATE Dockerfile.txt INSTEAD OF THIS FILE
# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
FROM selenium/node-chrome:2.53.1
FROM selenium/node-chrome:2.53.1-americium
MAINTAINER Selenium <selenium-developers@googlegroups.com>

USER root
Expand Down
2 changes: 1 addition & 1 deletion StandaloneChromeDebug/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# NOTE: DO *NOT* EDIT THIS FILE. IT IS GENERATED.
# PLEASE UPDATE Dockerfile.txt INSTEAD OF THIS FILE
# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
FROM selenium/standalone-chrome:2.53.1
FROM selenium/standalone-chrome:2.53.1-americium
MAINTAINER Selenium <selenium-developers@googlegroups.com>

USER root
Expand Down
2 changes: 1 addition & 1 deletion StandaloneFirefox/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# NOTE: DO *NOT* EDIT THIS FILE. IT IS GENERATED.
# PLEASE UPDATE Dockerfile.txt INSTEAD OF THIS FILE
# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
FROM selenium/node-firefox:2.53.1
FROM selenium/node-firefox:2.53.1-americium
MAINTAINER Selenium <selenium-developers@googlegroups.com>

USER root
Expand Down
2 changes: 1 addition & 1 deletion StandaloneFirefoxDebug/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# NOTE: DO *NOT* EDIT THIS FILE. IT IS GENERATED.
# PLEASE UPDATE Dockerfile.txt INSTEAD OF THIS FILE
# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
FROM selenium/standalone-firefox:2.53.1
FROM selenium/standalone-firefox:2.53.1-americium
MAINTAINER Selenium <selenium-developers@googlegroups.com>

USER root
Expand Down