Merging normal and debug images

Preparing for Selenium 4 Alpha 4

Author: diemol

Makefile

@@ -30,6 +30,23 @@ RUN apt-get -qqy update \
   && rm -rf /var/lib/apt/lists/* \
   && apt-get -qyy clean
 
+#=====
+# VNC
+#=====
+RUN apt-get update -qqy \
+  && apt-get -qqy install \
+  x11vnc \
+  && rm -rf /var/lib/apt/lists/* /var/cache/apt/*
+
+#=========
+# fluxbox
+# A fast, lightweight and responsive window manager
+#=========
+RUN apt-get update -qqy \
+  && apt-get -qqy install \
+    fluxbox \
+  && rm -rf /var/lib/apt/lists/* /var/cache/apt/*
+
 #================
 # Font libraries
 #================
@@ -82,6 +99,27 @@ COPY start-selenium-node.sh \
 #==============================
 COPY selenium.conf /etc/supervisor/conf.d/
 
+#==============================
+# Generating the VNC password as seluser
+# So the service can be started with seluser
+#==============================
+
+RUN mkdir -p ${HOME}/.vnc \
+  && x11vnc -storepasswd secret ${HOME}/.vnc/passwd
+
+#==========
+# Relaxing permissions for OpenShift and other non-sudo environments
+#==========
+RUN sudo chmod -R 777 ${HOME} \
+  && sudo chgrp -R 0 ${HOME} \
+  && sudo chmod -R g=u ${HOME}
+
+#==============================
+# Scripts to run fluxbox and x11vnc
+#==============================
+COPY start-fluxbox.sh \
+      start-vnc.sh \
+      /opt/bin/
 
 #============================
 # Some configuration options
@@ -122,3 +160,5 @@ ENV DBUS_SESSION_BUS_ADDRESS=/dev/null
 
 # Creating base directory for Xvfb
 RUN  sudo mkdir -p /tmp/.X11-unix && sudo chmod 1777 /tmp/.X11-unix
+
+EXPOSE 5900

NodeBase/Dockerfile.txt

@@ -1,6 +1,6 @@
 ; Documentation of this file format -> http://supervisord.org/configuration.html
 
-; Priority 0 - xvfb, 5 - fluxbox (debug images), 10 - x11vnc (debug images), 15 - selenium-node
+; Priority 0 - xvfb, 5 - fluxbox, 10 - x11vnc, 15 - selenium-node
 
 [program:xvfb]
 priority=0
@@ -21,6 +21,43 @@ stderr_logfile_backups=5
 stdout_capture_maxbytes=50MB
 stderr_capture_maxbytes=50MB
 
+[program:fluxbox]
+priority=5
+command=/opt/bin/start-fluxbox.sh
+autostart=true
+autorestart=unexpected
+startsecs=0
+startretries=0
+
+;Logs
+redirect_stderr=false
+stdout_logfile=/var/log/supervisor/fluxbox-stdout.log
+stderr_logfile=/var/log/supervisor/fluxbox-stderr.log
+stdout_logfile_maxbytes=50MB
+stderr_logfile_maxbytes=50MB
+stdout_logfile_backups=5
+stderr_logfile_backups=5
+stdout_capture_maxbytes=50MB
+stderr_capture_maxbytes=50MB
+
+[program:vnc]
+priority=10
+command=/opt/bin/start-vnc.sh
+autostart=true
+autorestart=false
+startsecs=0
+startretries=0
+
+;Logs
+redirect_stderr=false
+stdout_logfile=/var/log/supervisor/vnc-stdout.log
+stderr_logfile=/var/log/supervisor/vnc-stderr.log
+stdout_logfile_maxbytes=50MB
+stderr_logfile_maxbytes=50MB
+stdout_logfile_backups=5
+stderr_logfile_backups=5
+stdout_capture_maxbytes=50MB
+stderr_capture_maxbytes=50MB
 
 [program:selenium-node]
 priority=15