3.14.0-francium release

Author: diemol

.github/ISSUE_TEMPLATE.md

@@ -9,7 +9,7 @@
 Image(s):  
 <!-- node-chrome? hub? standalone-firefox? -->
 Docker-Selenium Image Version(s):  
-<!-- 3, 3.4, 3.14.0-europium etc -->
+<!-- 3, 3.4, 3.14.0-francium etc -->
 Docker Version:  
 <!-- 17.09.0-ce, 17.06.2-ce etc -->
 OS: 

Hub/Dockerfile

@@ -2,7 +2,7 @@
 # NOTE: DO *NOT* EDIT THIS FILE.  IT IS GENERATED.
 # PLEASE UPDATE Dockerfile.txt INSTEAD OF THIS FILE
 # !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-FROM selenium/base:3.14.0-europium
+FROM selenium/base:3.14.0-francium
 LABEL authors=SeleniumHQ
 
 USER seluser
@@ -35,9 +35,9 @@ ENV GRID_HUB_PORT 4444
 ENV GRID_HUB_HOST "0.0.0.0"
 
 COPY generate_config \
-    entry_point.sh \
+    start-selenium-hub.sh \
     /opt/bin/
 
-RUN /opt/bin/generate_config > /opt/selenium/config.json
+COPY selenium-hub.conf /etc/supervisor/conf.d/
 
-CMD ["/opt/bin/entry_point.sh"]
+RUN /opt/bin/generate_config > /opt/selenium/config.json

Makefile

@@ -1,5 +1,5 @@
 NAME := selenium
-VERSION := $(or $(VERSION),$(VERSION),3.14.0-europium)
+VERSION := $(or $(VERSION),$(VERSION),3.14.0-francium)
 NAMESPACE := $(or $(NAMESPACE),$(NAMESPACE),$(NAME))
 AUTHORS := $(or $(AUTHORS),$(AUTHORS),SeleniumHQ)
 PLATFORM := $(shell uname -s)

NodeBase/Dockerfile

@@ -2,7 +2,7 @@
 # NOTE: DO *NOT* EDIT THIS FILE.  IT IS GENERATED.
 # PLEASE UPDATE Dockerfile.txt INSTEAD OF THIS FILE
 # !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-FROM selenium/base:3.14.0-europium
+FROM selenium/base:3.14.0-francium
 LABEL authors=SeleniumHQ
 
 USER root
@@ -77,16 +77,26 @@ RUN apt-get -qqy update \
 USER seluser
 
 #==============================
-# Scripts to run Selenium Node
+# Scripts to run Selenium Node and XVFB
 #==============================
-COPY entry_point.sh  /opt/bin/
+COPY start-selenium-node.sh \
+      start-xvfb.sh \
+      /opt/bin/
+
+#==============================
+# Supervisor configuration file
+#==============================
+COPY selenium.conf /etc/supervisor/conf.d/
+
 
 #============================
 # Some configuration options
 #============================
 ENV SCREEN_WIDTH 1360
 ENV SCREEN_HEIGHT 1020
 ENV SCREEN_DEPTH 24
+ENV DISPLAY :99.0
+ENV START_XVFB true
 
 #========================
 # Selenium Configuration
@@ -113,4 +123,5 @@ ENV NODE_APPLICATION_NAME ""
 # Following line fixes https://github.com/SeleniumHQ/docker-selenium/issues/87
 ENV DBUS_SESSION_BUS_ADDRESS=/dev/null
 
-CMD ["/opt/bin/entry_point.sh"]
+# Creating base directory for Xvfb
+RUN  sudo mkdir -p /tmp/.X11-unix && sudo chmod 1777 /tmp/.X11-unix

NodeChrome/Dockerfile

@@ -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:3.14.0-europium
+FROM selenium/node-base:3.14.0-francium
 LABEL authors=SeleniumHQ
 
 USER root

NodeChromeDebug/Dockerfile

@@ -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:3.14.0-europium
+FROM selenium/node-chrome:3.14.0-francium
 LABEL authors=SeleniumHQ
 
 USER root
@@ -35,8 +35,15 @@ RUN mkdir -p ~/.vnc \
   && x11vnc -storepasswd secret ~/.vnc/passwd
 
 #==============================
-# Scripts to run Selenium Node
+# Scripts to run fluxbox and x11vnc
 #==============================
-COPY entry_point.sh /opt/bin/entry_point.sh
+COPY start-fluxbox.sh \
+      start-vnc.sh \
+      /opt/bin/
+
+#==============================
+# Supervisor configuration file
+#==============================
+COPY selenium-debug.conf /etc/supervisor/conf.d/
 
 EXPOSE 5900

NodeChromeDebug/README.md

@@ -37,7 +37,7 @@ If you are running Boot2Docker on Mac then you already have a [VNC client](http:
 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:
 
 ``` dockerfile
-FROM selenium/node-chrome-debug:3.14.0-europium
+FROM selenium/node-chrome-debug:3.14.0-francium
 
 RUN x11vnc -storepasswd <your-password-here> /home/seluser/.vnc/passwd
 ```

NodeDebug/README.template.md

@@ -37,7 +37,7 @@ If you are running Boot2Docker on Mac then you already have a [VNC client](http:
 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:
 
 ``` dockerfile
-FROM selenium/##BASE##-debug:3.14.0-europium
+FROM selenium/##BASE##-debug:3.14.0-francium
 
 RUN x11vnc -storepasswd <your-password-here> /home/seluser/.vnc/passwd
 ```

NodeFirefox/Dockerfile

@@ -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:3.14.0-europium
+FROM selenium/node-base:3.14.0-francium
 LABEL authors=SeleniumHQ
 
 USER root

NodeFirefoxDebug/Dockerfile

@@ -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:3.14.0-europium
+FROM selenium/node-firefox:3.14.0-francium
 LABEL authors=SeleniumHQ
 
 USER root
@@ -35,8 +35,15 @@ RUN mkdir -p ~/.vnc \
   && x11vnc -storepasswd secret ~/.vnc/passwd
 
 #==============================
-# Scripts to run Selenium Node
+# Scripts to run fluxbox and x11vnc
 #==============================
-COPY entry_point.sh /opt/bin/entry_point.sh
+COPY start-fluxbox.sh \
+      start-vnc.sh \
+      /opt/bin/
+
+#==============================
+# Supervisor configuration file
+#==============================
+COPY selenium-debug.conf /etc/supervisor/conf.d/
 
 EXPOSE 5900

NodeFirefoxDebug/README.md

@@ -37,7 +37,7 @@ If you are running Boot2Docker on Mac then you already have a [VNC client](http:
 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:
 
 ``` dockerfile
-FROM selenium/node-firefox-debug:3.14.0-europium
+FROM selenium/node-firefox-debug:3.14.0-francium
 
 RUN x11vnc -storepasswd <your-password-here> /home/seluser/.vnc/passwd
 ```