Skip to content

Commit 7b6ca64

Browse files
ddavisonddavison
committed
dysprisum release
1 parent 58fd147 commit 7b6ca64

File tree

19 files changed

+126
-224
lines changed

19 files changed

+126
-224
lines changed

‎.github/ISSUE_TEMPLATE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
Image(s):
33
<!-- node-chrome? hub? standalone-firefox? -->
44
Docker-Selenium Image Version(s):
5-
<!-- 3, 3.4, 3.4.0-chromium etc -->
5+
<!-- 3, 3.4, 3.4.0-dysprosium etc -->
66
OS:
77
<!-- Windows 10, OSX Yosemite, Centos6, etc -->
88

‎Hub/Dockerfile

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,11 @@
22
# NOTE: DO *NOT* EDIT THIS FILE. IT IS GENERATED.
33
# PLEASE UPDATE Dockerfile.txt INSTEAD OF THIS FILE
44
# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
5-
FROM selenium/base:3.4.0-chromium
5+
FROM selenium/base:3.4.0-dysprosium
66
LABEL authors=SeleniumHQ
77

8+
USER seluser
9+
810
#========================
911
# Selenium Configuration
1012
#========================
@@ -28,11 +30,12 @@ ENV GRID_TIMEOUT 30
2830
# Debug
2931
ENV GRID_DEBUG false
3032

31-
COPY generate_config /opt/selenium/generate_config
32-
COPY entry_point.sh /opt/bin/entry_point.sh
33-
RUN /opt/selenium/generate_config > /opt/selenium/config.json
34-
RUN chown -R seluser /opt/selenium
35-
36-
USER seluser
33+
COPY generate_config \
34+
entry_point.sh \
35+
/opt/bin/
36+
# Running this command as sudo just to avoid the message:
37+
# To run a command as administrator (user "root"), use "sudo <command>". See "man sudo_root" for details.
38+
# When logging into the container
39+
RUN sudo /opt/bin/generate_config > /opt/selenium/config.json
3740

3841
CMD ["/opt/bin/entry_point.sh"]

‎Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
NAME := selenium
2-
VERSION := $(or $(VERSION),$(VERSION),3.4.0-chromium)
2+
VERSION := $(or $(VERSION),$(VERSION),3.4.0-dysprosium)
33
NAMESPACE := $(or $(NAMESPACE),$(NAMESPACE),$(NAME))
44
AUTHORS := $(or $(AUTHORS),$(AUTHORS),SeleniumHQ)
55
PLATFORM := $(shell uname -s)

‎NodeBase/Dockerfile

Lines changed: 31 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,10 @@
22
# NOTE: DO *NOT* EDIT THIS FILE. IT IS GENERATED.
33
# PLEASE UPDATE Dockerfile.txt INSTEAD OF THIS FILE
44
# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
5-
FROM selenium/base:3.4.0-chromium
5+
FROM selenium/base:3.4.0-dysprosium
66
LABEL authors=SeleniumHQ
77

8-
ENV DEBIAN_FRONTEND noninteractive
9-
ENV DEBCONF_NONINTERACTIVE_SEEN true
8+
USER root
109

1110
#==============
1211
# VNC and Xvfb
@@ -17,14 +16,18 @@ RUN apt-get update -qqy \
1716
xvfb \
1817
&& rm -rf /var/lib/apt/lists/* /var/cache/apt/*
1918

19+
#===================================================
20+
# Run the following commands as non-privileged user
21+
#===================================================
22+
23+
USER seluser
24+
2025
#==============================
2126
# Scripts to run Selenium Node
2227
#==============================
23-
COPY \
24-
entry_point.sh \
28+
COPY entry_point.sh \
2529
functions.sh \
2630
/opt/bin/
27-
RUN chmod +x /opt/bin/entry_point.sh
2831

2932
#============================
3033
# Some configuration options
@@ -34,6 +37,27 @@ ENV SCREEN_HEIGHT 1020
3437
ENV SCREEN_DEPTH 24
3538
ENV DISPLAY :99.0
3639

37-
USER seluser
40+
#========================
41+
# Selenium Configuration
42+
#========================
43+
# As integer, maps to "maxInstances"
44+
ENV NODE_MAX_INSTANCES 1
45+
# As integer, maps to "maxSession"
46+
ENV NODE_MAX_SESSION 1
47+
# As integer, maps to "port"
48+
ENV NODE_PORT 5555
49+
# In milliseconds, maps to "registerCycle"
50+
ENV NODE_REGISTER_CYCLE 5000
51+
# In milliseconds, maps to "nodePolling"
52+
ENV NODE_POLLING 5000
53+
# In milliseconds, maps to "unregisterIfStillDownAfter"
54+
ENV NODE_UNREGISTER_IF_STILL_DOWN_AFTER 60000
55+
# As integer, maps to "downPollingLimit"
56+
ENV NODE_DOWN_POLLING_LIMIT 2
57+
# As string, maps to "applicationName"
58+
ENV NODE_APPLICATION_NAME ""
59+
60+
# Following line fixes https://github.com/SeleniumHQ/docker-selenium/issues/87
61+
ENV DBUS_SESSION_BUS_ADDRESS=/dev/null
3862

3963
CMD ["/opt/bin/entry_point.sh"]

‎NodeChrome/Dockerfile

Lines changed: 6 additions & 33 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:3.4.0-chromium
5+
FROM selenium/node-base:3.4.0-dysprosium
66
LABEL authors=SeleniumHQ
77

88
USER root
@@ -26,50 +26,23 @@ RUN wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key
2626
&& rm /etc/apt/sources.list.d/google-chrome.list \
2727
&& rm -rf /var/lib/apt/lists/* /var/cache/apt/*
2828

29+
USER seluser
30+
2931
#==================
3032
# Chrome webdriver
3133
#==================
32-
ARG CHROME_DRIVER_VERSION=2.29
34+
ARG CHROME_DRIVER_VERSION=2.30
3335
RUN wget --no-verbose -O /tmp/chromedriver_linux64.zip https://chromedriver.storage.googleapis.com/$CHROME_DRIVER_VERSION/chromedriver_linux64.zip \
3436
&& rm -rf /opt/selenium/chromedriver \
3537
&& unzip /tmp/chromedriver_linux64.zip -d /opt/selenium \
3638
&& rm /tmp/chromedriver_linux64.zip \
3739
&& mv /opt/selenium/chromedriver /opt/selenium/chromedriver-$CHROME_DRIVER_VERSION \
3840
&& chmod 755 /opt/selenium/chromedriver-$CHROME_DRIVER_VERSION \
39-
&& ln -fs /opt/selenium/chromedriver-$CHROME_DRIVER_VERSION /usr/bin/chromedriver
41+
&& sudo ln -fs /opt/selenium/chromedriver-$CHROME_DRIVER_VERSION /usr/bin/chromedriver
4042

41-
#========================
42-
# Selenium Configuration
43-
#========================
44-
# As integer, maps to "maxInstances"
45-
ENV NODE_MAX_INSTANCES 1
46-
# As integer, maps to "maxSession"
47-
ENV NODE_MAX_SESSION 1
48-
# As integer, maps to "port"
49-
ENV NODE_PORT 5555
50-
# In milliseconds, maps to "registerCycle"
51-
ENV NODE_REGISTER_CYCLE 5000
52-
# In milliseconds, maps to "nodePolling"
53-
ENV NODE_POLLING 5000
54-
# In milliseconds, maps to "unregisterIfStillDownAfter"
55-
ENV NODE_UNREGISTER_IF_STILL_DOWN_AFTER 60000
56-
# As integer, maps to "downPollingLimit"
57-
ENV NODE_DOWN_POLLING_LIMIT 2
58-
# As string, maps to "applicationName"
59-
ENV NODE_APPLICATION_NAME ""
60-
61-
COPY generate_config /opt/selenium/generate_config
62-
RUN chmod +x /opt/selenium/generate_config
43+
COPY generate_config /opt/bin/generate_config
6344

6445
#=================================
6546
# Chrome Launch Script Modification
6647
#=================================
6748
COPY chrome_launcher.sh /opt/google/chrome/google-chrome
68-
RUN chmod +x /opt/google/chrome/google-chrome
69-
70-
RUN chown -R seluser:seluser /opt/selenium
71-
72-
# Following line fixes https://github.com/SeleniumHQ/docker-selenium/issues/87
73-
ENV DBUS_SESSION_BUS_ADDRESS=/dev/null
74-
75-
USER seluser

‎NodeChromeDebug/Dockerfile

Lines changed: 12 additions & 5 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-chrome:3.4.0-chromium
5+
FROM selenium/node-chrome:3.4.0-dysprosium
66
LABEL authors=SeleniumHQ
77

88
USER root
@@ -13,9 +13,7 @@ USER root
1313
RUN apt-get update -qqy \
1414
&& apt-get -qqy install \
1515
x11vnc \
16-
&& rm -rf /var/lib/apt/lists/* /var/cache/apt/* \
17-
&& mkdir -p /root/.vnc \
18-
&& x11vnc -storepasswd secret ~/.vnc/passwd
16+
&& rm -rf /var/lib/apt/lists/* /var/cache/apt/*
1917

2018
#=================
2119
# Locale settings
@@ -50,10 +48,19 @@ RUN apt-get update -qqy \
5048
fluxbox \
5149
&& rm -rf /var/lib/apt/lists/* /var/cache/apt/*
5250

51+
USER seluser
52+
53+
#==============================
54+
# Generating the VNC password as seluser
55+
# So the service can be started with seluser
56+
#==============================
57+
58+
RUN mkdir -p ~/.vnc \
59+
&& x11vnc -storepasswd secret ~/.vnc/passwd
60+
5361
#==============================
5462
# Scripts to run Selenium Node
5563
#==============================
5664
COPY entry_point.sh /opt/bin/entry_point.sh
57-
RUN chmod +x /opt/bin/entry_point.sh
5865

5966
EXPOSE 5900

‎NodeChromeDebug/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ If you are running Boot2Docker on Mac then you already have a [VNC client](http:
3838
When you are prompted for the password it is __secret__. If you wish to change this then you should either change it in the `/NodeBase/Dockerfile` and build the images yourself, or you can define a docker image that derives from the posted ones which reconfigures it:
3939

4040
``` dockerfile
41-
FROM selenium/node-chrome-debug:3.4.0-chromium
41+
FROM selenium/node-chrome-debug:3.4.0-dysprosium
4242

4343
RUN x11vnc -storepasswd <your-password-here> /home/seluser/.vnc/passwd
4444
```

‎NodeDebug/README.template.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ If you are running Boot2Docker on Mac then you already have a [VNC client](http:
3838
When you are prompted for the password it is __secret__. If you wish to change this then you should either change it in the `/NodeBase/Dockerfile` and build the images yourself, or you can define a docker image that derives from the posted ones which reconfigures it:
3939

4040
``` dockerfile
41-
FROM selenium/##BASE##-debug:3.4.0-chromium
41+
FROM selenium/##BASE##-debug:3.4.0-dysprosium
4242

4343
RUN x11vnc -storepasswd <your-password-here> /home/seluser/.vnc/passwd
4444
```

‎NodeFirefox/Dockerfile

Lines changed: 7 additions & 27 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:3.4.0-chromium
5+
FROM selenium/node-base:3.4.0-dysprosium
66
LABEL authors=SeleniumHQ
77

88
USER root
@@ -34,31 +34,11 @@ RUN wget --no-verbose -O /tmp/geckodriver.tar.gz https://github.com/mozilla/geck
3434
&& chmod 755 /opt/geckodriver-$GECKODRIVER_VERSION \
3535
&& ln -fs /opt/geckodriver-$GECKODRIVER_VERSION /usr/bin/geckodriver
3636

37-
#========================
38-
# Selenium Configuration
39-
#========================
40-
# As integer, maps to "maxInstances"
41-
ENV NODE_MAX_INSTANCES 1
42-
# As integer, maps to "maxSession"
43-
ENV NODE_MAX_SESSION 1
44-
# As integer, maps to "port"
45-
ENV NODE_PORT 5555
46-
# In milliseconds, maps to "registerCycle"
47-
ENV NODE_REGISTER_CYCLE 5000
48-
# In milliseconds, maps to "nodePolling"
49-
ENV NODE_POLLING 5000
50-
# In milliseconds, maps to "unregisterIfStillDownAfter"
51-
ENV NODE_UNREGISTER_IF_STILL_DOWN_AFTER 60000
52-
# As integer, maps to "downPollingLimit"
53-
ENV NODE_DOWN_POLLING_LIMIT 2
54-
# As string, maps to "applicationName"
55-
ENV NODE_APPLICATION_NAME ""
56-
57-
COPY generate_config /opt/selenium/generate_config
58-
RUN chmod +x /opt/selenium/generate_config \
59-
&& chown -R seluser:seluser /opt/selenium
37+
USER seluser
6038

61-
# Following line fixes https://github.com/SeleniumHQ/docker-selenium/issues/87
62-
ENV DBUS_SESSION_BUS_ADDRESS=/dev/null
39+
COPY generate_config /opt/bin/generate_config
6340

64-
USER seluser
41+
# Running this command as sudo just to avoid the message:
42+
# To run a command as administrator (user "root"), use "sudo <command>". See "man sudo_root" for details.
43+
# When logging into the container
44+
RUN sudo echo ""

‎NodeFirefoxDebug/Dockerfile

Lines changed: 12 additions & 5 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-firefox:3.4.0-chromium
5+
FROM selenium/node-firefox:3.4.0-dysprosium
66
LABEL authors=SeleniumHQ
77

88
USER root
@@ -13,9 +13,7 @@ USER root
1313
RUN apt-get update -qqy \
1414
&& apt-get -qqy install \
1515
x11vnc \
16-
&& rm -rf /var/lib/apt/lists/* /var/cache/apt/* \
17-
&& mkdir -p /root/.vnc \
18-
&& x11vnc -storepasswd secret ~/.vnc/passwd
16+
&& rm -rf /var/lib/apt/lists/* /var/cache/apt/*
1917

2018
#=================
2119
# Locale settings
@@ -50,10 +48,19 @@ RUN apt-get update -qqy \
5048
fluxbox \
5149
&& rm -rf /var/lib/apt/lists/* /var/cache/apt/*
5250

51+
USER seluser
52+
53+
#==============================
54+
# Generating the VNC password as seluser
55+
# So the service can be started with seluser
56+
#==============================
57+
58+
RUN mkdir -p ~/.vnc \
59+
&& x11vnc -storepasswd secret ~/.vnc/passwd
60+
5361
#==============================
5462
# Scripts to run Selenium Node
5563
#==============================
5664
COPY entry_point.sh /opt/bin/entry_point.sh
57-
RUN chmod +x /opt/bin/entry_point.sh
5865

5966
EXPOSE 5900

‎NodeFirefoxDebug/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ If you are running Boot2Docker on Mac then you already have a [VNC client](http:
3838
When you are prompted for the password it is __secret__. If you wish to change this then you should either change it in the `/NodeBase/Dockerfile` and build the images yourself, or you can define a docker image that derives from the posted ones which reconfigures it:
3939

4040
``` dockerfile
41-
FROM selenium/node-firefox-debug:3.4.0-chromium
41+
FROM selenium/node-firefox-debug:3.4.0-dysprosium
4242

4343
RUN x11vnc -storepasswd <your-password-here> /home/seluser/.vnc/passwd
4444
```

‎NodePhantomJS/Dockerfile

Lines changed: 2 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:3.4.0-chromium
5+
FROM selenium/node-base:3.4.0-dysprosium
66
LABEL authors=SeleniumHQ
77

88
USER root
@@ -14,7 +14,7 @@ RUN apt-get update -y
1414
RUN apt-get install bzip2 libfreetype6 libfontconfig1 -y
1515
RUN wget https://bitbucket.org/ariya/phantomjs/downloads/phantomjs-1.9.8-linux-x86_64.tar.bz2
1616
RUN tar -xvjf phantomjs-1.9.8-linux-x86_64.tar.bz2 && rm phantomjs-1.9.8-linux-x86_64.tar.bz2
17-
RUN mv /phantomjs-1.9.8-linux-x86_64 /usr/local/phantomjs-1.9.8-linux-x86_64
17+
RUN mv phantomjs-1.9.8-linux-x86_64 /usr/local/phantomjs-1.9.8-linux-x86_64
1818
RUN ln -s /usr/local/phantomjs-1.9.8-linux-x86_64/bin/phantomjs /usr/local/bin/phantomjs
1919

2020
#==============================

0 commit comments

Comments
 (0)