From ca4da7ad2225ebe6be77ba980cc3408fd792096f Mon Sep 17 00:00:00 2001
From: Diego Molina <diemol@gmail.com>
Date: Mon, 1 May 2017 11:21:40 +0200
Subject: [PATCH 01/16] Setting env var for docker build, plus leaving selenium
 files under home user folder.

---
 Base/Dockerfile | 32 +++++++++++++++++++++++---------
 1 file changed, 23 insertions(+), 9 deletions(-)

diff --git a/Base/Dockerfile b/Base/Dockerfile
index 9bd86c514f..e42a8cbafd 100644
--- a/Base/Dockerfile
+++ b/Base/Dockerfile
@@ -8,11 +8,15 @@ RUN  echo "deb http://archive.ubuntu.com/ubuntu xenial main universe\n" > /etc/a
   && echo "deb http://archive.ubuntu.com/ubuntu xenial-updates main universe\n" >> /etc/apt/sources.list \
   && echo "deb http://security.ubuntu.com/ubuntu xenial-security main universe\n" >> /etc/apt/sources.list
 
+# No interactive frontend during docker build
+ENV DEBIAN_FRONTEND=noninteractive \
+    DEBCONF_NONINTERACTIVE_SEEN=true
+
 #========================
 # Miscellaneous packages
 # Includes minimal runtime used for executing non GUI Java programs
 #========================
-RUN apt-get update -qqy \
+RUN apt-get -qqy update \
   && apt-get -qqy --no-install-recommends install \
     bzip2 \
     ca-certificates \
@@ -32,16 +36,26 @@ ENV TZ "UTC"
 RUN echo "${TZ}" > /etc/timezone \
   && dpkg-reconfigure --frontend noninteractive tzdata
 
-#==========
-# Selenium
-#==========
-RUN  mkdir -p /opt/selenium \
-  && wget --no-verbose https://selenium-release.storage.googleapis.com/3.4/selenium-server-standalone-3.4.0.jar -O /opt/selenium/selenium-server-standalone.jar
-
 #========================================
 # Add normal user with passwordless sudo
 #========================================
-RUN sudo useradd seluser --shell /bin/bash --create-home \
-  && sudo usermod -a -G sudo seluser \
+RUN useradd seluser \
+         --shell /bin/bash  \
+         --create-home \
+  && usermod -a -G sudo seluser \
   && echo 'ALL ALL = (ALL) NOPASSWD: ALL' >> /etc/sudoers \
   && echo 'seluser:secret' | chpasswd
+
+#===================================================
+# Run the following commands as non-privileged user
+#===================================================
+USER seluser
+WORKDIR /home/seluser
+
+#==========
+# Selenium
+#==========
+RUN  mkdir -p /home/seluser/selenium \
+  && wget --no-verbose https://selenium-release.storage.googleapis.com/3.4/selenium-server-standalone-3.4.0.jar \
+    -O /home/seluser/selenium/selenium-server-standalone.jar
+

From 553df4efcb741e37332a37e843b9b7517284466b Mon Sep 17 00:00:00 2001
From: Diego Molina <diemol@gmail.com>
Date: Mon, 1 May 2017 11:22:47 +0200
Subject: [PATCH 02/16] Running commands as seluser instead of root.

---
 Hub/Dockerfile.txt | 15 +++++++++------
 Hub/entry_point.sh |  8 ++++----
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/Hub/Dockerfile.txt b/Hub/Dockerfile.txt
index fa126b9bf3..01dc8dc721 100644
--- a/Hub/Dockerfile.txt
+++ b/Hub/Dockerfile.txt
@@ -1,3 +1,5 @@
+USER seluser
+
 #========================
 # Selenium Configuration
 #========================
@@ -21,11 +23,12 @@ ENV GRID_TIMEOUT 30
 # Debug
 ENV GRID_DEBUG false
 
-COPY generate_config /opt/selenium/generate_config
-COPY entry_point.sh /opt/bin/entry_point.sh
-RUN /opt/selenium/generate_config > /opt/selenium/config.json
-RUN chown -R seluser /opt/selenium
-
-USER seluser
+COPY generate_config \
+    entry_point.sh \
+    /opt/bin/
+# Running this command as sudo just to avoid the message:
+# To run a command as administrator (user "root"), use "sudo <command>". See "man sudo_root" for details.
+# When logging into the container
+RUN sudo /opt/bin/generate_config > /home/seluser/selenium/config.json
 
 CMD ["/opt/bin/entry_point.sh"]
diff --git a/Hub/entry_point.sh b/Hub/entry_point.sh
index 4c3016cd8c..b95efbaf07 100755
--- a/Hub/entry_point.sh
+++ b/Hub/entry_point.sh
@@ -1,9 +1,9 @@
 #!/bin/bash
 
-ROOT=/opt/selenium
+ROOT=/home/seluser/selenium
 CONF=$ROOT/config.json
 
-$ROOT/generate_config >$CONF
+/opt/bin/generate_config >$CONF
 
 echo "starting selenium hub with configuration:"
 cat $CONF
@@ -19,11 +19,11 @@ function shutdown {
     echo "shutdown complete"
 }
 
-java ${JAVA_OPTS} -jar /opt/selenium/selenium-server-standalone.jar \
+java ${JAVA_OPTS} -jar /home/seluser/selenium/selenium-server-standalone.jar \
   -role hub \
   -hubConfig $CONF \
   ${SE_OPTS} &
 NODE_PID=$!
 
 trap shutdown SIGTERM SIGINT
-wait $NODE_PID
\ No newline at end of file
+wait $NODE_PID

From c8064de68c4bc323db30e473e851a55fe12e92a3 Mon Sep 17 00:00:00 2001
From: Diego Molina <diemol@gmail.com>
Date: Mon, 1 May 2017 12:49:13 +0200
Subject: [PATCH 03/16] Running commands as seluser

---
 NodeBase/Dockerfile.txt | 15 ++++++++-------
 NodeBase/entry_point.sh | 12 +++++-------
 2 files changed, 13 insertions(+), 14 deletions(-)
 mode change 100644 => 100755 NodeBase/entry_point.sh

diff --git a/NodeBase/Dockerfile.txt b/NodeBase/Dockerfile.txt
index 49549f43db..8197f7034a 100644
--- a/NodeBase/Dockerfile.txt
+++ b/NodeBase/Dockerfile.txt
@@ -1,5 +1,4 @@
-ENV DEBIAN_FRONTEND noninteractive
-ENV DEBCONF_NONINTERACTIVE_SEEN true
+USER root
 
 #==============
 # VNC and Xvfb
@@ -10,14 +9,18 @@ RUN apt-get update -qqy \
     xvfb \
   && rm -rf /var/lib/apt/lists/* /var/cache/apt/*
 
+#===================================================
+# Run the following commands as non-privileged user
+#===================================================
+
+USER seluser
+
 #==============================
 # Scripts to run Selenium Node
 #==============================
-COPY \
-  entry_point.sh \
+COPY entry_point.sh \
   functions.sh \
     /opt/bin/
-RUN chmod +x /opt/bin/entry_point.sh
 
 #============================
 # Some configuration options
@@ -27,6 +30,4 @@ ENV SCREEN_HEIGHT 1020
 ENV SCREEN_DEPTH 24
 ENV DISPLAY :99.0
 
-USER seluser
-
 CMD ["/opt/bin/entry_point.sh"]
diff --git a/NodeBase/entry_point.sh b/NodeBase/entry_point.sh
old mode 100644
new mode 100755
index c85c17f0e9..8be14d8c01
--- a/NodeBase/entry_point.sh
+++ b/NodeBase/entry_point.sh
@@ -1,11 +1,11 @@
 #!/bin/bash
 
 source /opt/bin/functions.sh
-/opt/selenium/generate_config > /opt/selenium/config.json
+/opt/bin/generate_config > /home/seluser/selenium/config.json
 
 export GEOMETRY="$SCREEN_WIDTH""x""$SCREEN_HEIGHT""x""$SCREEN_DEPTH"
 
-if [ ! -e /opt/selenium/config.json ]; then
+if [ ! -e /home/seluser/selenium/config.json ]; then
   echo No Selenium Node configuration file, the node-base image is not intended to be run directly. 1>&2
   exit 1
 fi
@@ -29,19 +29,17 @@ if [ ! -z "$SE_OPTS" ]; then
   echo "appending selenium options: ${SE_OPTS}"
 fi
 
-# TODO: Look into http://www.seleniumhq.org/docs/05_selenium_rc.jsp#browser-side-logs
-
 SERVERNUM=$(get_server_num)
 
 rm -f /tmp/.X*lock
 
 xvfb-run -n $SERVERNUM --server-args="-screen 0 $GEOMETRY -ac +extension RANDR" \
-  java ${JAVA_OPTS} -jar /opt/selenium/selenium-server-standalone.jar \
+  java ${JAVA_OPTS} -jar /home/seluser/selenium/selenium-server-standalone.jar \
     -role node \
     -hub http://$HUB_PORT_4444_TCP_ADDR:$HUB_PORT_4444_TCP_PORT/grid/register \
-    -nodeConfig /opt/selenium/config.json \
+    -nodeConfig /home/seluser/selenium/config.json \
     ${SE_OPTS} &
 NODE_PID=$!
 
 trap shutdown SIGTERM SIGINT
-wait $NODE_PID
\ No newline at end of file
+wait $NODE_PID

From 4369255769112faff234f2bb91046a7e155abcf9 Mon Sep 17 00:00:00 2001
From: Diego Molina <diemol@gmail.com>
Date: Mon, 1 May 2017 12:50:20 +0200
Subject: [PATCH 04/16] Setting file permissions, env vars as seluser executing
 commands as non root.

---
 NodeChrome/Dockerfile.txt     | 20 ++++++++------------
 NodeChrome/chrome_launcher.sh |  0
 2 files changed, 8 insertions(+), 12 deletions(-)
 mode change 100644 => 100755 NodeChrome/chrome_launcher.sh

diff --git a/NodeChrome/Dockerfile.txt b/NodeChrome/Dockerfile.txt
index 46db2b5671..64ac2de4c2 100644
--- a/NodeChrome/Dockerfile.txt
+++ b/NodeChrome/Dockerfile.txt
@@ -19,17 +19,19 @@ RUN wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key
   && rm /etc/apt/sources.list.d/google-chrome.list \
   && rm -rf /var/lib/apt/lists/* /var/cache/apt/*
 
+USER seluser
+
 #==================
 # Chrome webdriver
 #==================
 ARG CHROME_DRIVER_VERSION=2.29
 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 \
+  && rm -rf /home/seluser/selenium/chromedriver \
+  && unzip /tmp/chromedriver_linux64.zip -d /home/seluser/selenium \
   && rm /tmp/chromedriver_linux64.zip \
-  && mv /opt/selenium/chromedriver /opt/selenium/chromedriver-$CHROME_DRIVER_VERSION \
-  && chmod 755 /opt/selenium/chromedriver-$CHROME_DRIVER_VERSION \
-  && ln -fs /opt/selenium/chromedriver-$CHROME_DRIVER_VERSION /usr/bin/chromedriver
+  && mv /home/seluser/selenium/chromedriver /home/seluser/selenium/chromedriver-$CHROME_DRIVER_VERSION \
+  && chmod 755 /home/seluser/selenium/chromedriver-$CHROME_DRIVER_VERSION \
+  && sudo ln -fs /home/seluser/selenium/chromedriver-$CHROME_DRIVER_VERSION /usr/bin/chromedriver
 
 #========================
 # Selenium Configuration
@@ -51,18 +53,12 @@ ENV NODE_DOWN_POLLING_LIMIT 2
 # As string, maps to "applicationName"
 ENV NODE_APPLICATION_NAME ""
 
-COPY generate_config /opt/selenium/generate_config
-RUN chmod +x /opt/selenium/generate_config
+COPY generate_config /opt/bin/generate_config
 
 #=================================
 # Chrome Launch Script Modification
 #=================================
 COPY chrome_launcher.sh /opt/google/chrome/google-chrome
-RUN chmod +x /opt/google/chrome/google-chrome
-
-RUN chown -R seluser:seluser /opt/selenium
 
 # Following line fixes https://github.com/SeleniumHQ/docker-selenium/issues/87
 ENV DBUS_SESSION_BUS_ADDRESS=/dev/null
-
-USER seluser
diff --git a/NodeChrome/chrome_launcher.sh b/NodeChrome/chrome_launcher.sh
old mode 100644
new mode 100755

From e39dcc7f22a2492bfc9549dc3e6fa18a9e269eb6 Mon Sep 17 00:00:00 2001
From: Diego Molina <diemol@gmail.com>
Date: Mon, 1 May 2017 13:42:32 +0200
Subject: [PATCH 05/16] Refactoring common config for Chrome and Firefox nodes,
 running commands as seluser

---
 NodeBase/Dockerfile.txt    | 23 +++++++++++++++++++++++
 NodeChrome/Dockerfile.txt  | 23 -----------------------
 NodeFirefox/Dockerfile.txt | 32 ++++++--------------------------
 3 files changed, 29 insertions(+), 49 deletions(-)

diff --git a/NodeBase/Dockerfile.txt b/NodeBase/Dockerfile.txt
index 8197f7034a..70f791eab3 100644
--- a/NodeBase/Dockerfile.txt
+++ b/NodeBase/Dockerfile.txt
@@ -30,4 +30,27 @@ ENV SCREEN_HEIGHT 1020
 ENV SCREEN_DEPTH 24
 ENV DISPLAY :99.0
 
+#========================
+# Selenium Configuration
+#========================
+# As integer, maps to "maxInstances"
+ENV NODE_MAX_INSTANCES 1
+# As integer, maps to "maxSession"
+ENV NODE_MAX_SESSION 1
+# As integer, maps to "port"
+ENV NODE_PORT 5555
+# In milliseconds, maps to "registerCycle"
+ENV NODE_REGISTER_CYCLE 5000
+# In milliseconds, maps to "nodePolling"
+ENV NODE_POLLING 5000
+# In milliseconds, maps to "unregisterIfStillDownAfter"
+ENV NODE_UNREGISTER_IF_STILL_DOWN_AFTER 60000
+# As integer, maps to "downPollingLimit"
+ENV NODE_DOWN_POLLING_LIMIT 2
+# As string, maps to "applicationName"
+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"]
diff --git a/NodeChrome/Dockerfile.txt b/NodeChrome/Dockerfile.txt
index 64ac2de4c2..e462e0d7dc 100644
--- a/NodeChrome/Dockerfile.txt
+++ b/NodeChrome/Dockerfile.txt
@@ -33,32 +33,9 @@ RUN wget --no-verbose -O /tmp/chromedriver_linux64.zip https://chromedriver.stor
   && chmod 755 /home/seluser/selenium/chromedriver-$CHROME_DRIVER_VERSION \
   && sudo ln -fs /home/seluser/selenium/chromedriver-$CHROME_DRIVER_VERSION /usr/bin/chromedriver
 
-#========================
-# Selenium Configuration
-#========================
-# As integer, maps to "maxInstances"
-ENV NODE_MAX_INSTANCES 1
-# As integer, maps to "maxSession"
-ENV NODE_MAX_SESSION 1
-# As integer, maps to "port"
-ENV NODE_PORT 5555
-# In milliseconds, maps to "registerCycle"
-ENV NODE_REGISTER_CYCLE 5000
-# In milliseconds, maps to "nodePolling"
-ENV NODE_POLLING 5000
-# In milliseconds, maps to "unregisterIfStillDownAfter"
-ENV NODE_UNREGISTER_IF_STILL_DOWN_AFTER 60000
-# As integer, maps to "downPollingLimit"
-ENV NODE_DOWN_POLLING_LIMIT 2
-# As string, maps to "applicationName"
-ENV NODE_APPLICATION_NAME ""
-
 COPY generate_config /opt/bin/generate_config
 
 #=================================
 # Chrome Launch Script Modification
 #=================================
 COPY chrome_launcher.sh /opt/google/chrome/google-chrome
-
-# Following line fixes https://github.com/SeleniumHQ/docker-selenium/issues/87
-ENV DBUS_SESSION_BUS_ADDRESS=/dev/null
diff --git a/NodeFirefox/Dockerfile.txt b/NodeFirefox/Dockerfile.txt
index a06e521ca6..55c0ab91bc 100644
--- a/NodeFirefox/Dockerfile.txt
+++ b/NodeFirefox/Dockerfile.txt
@@ -27,31 +27,11 @@ RUN wget --no-verbose -O /tmp/geckodriver.tar.gz https://github.com/mozilla/geck
   && chmod 755 /opt/geckodriver-$GECKODRIVER_VERSION \
   && ln -fs /opt/geckodriver-$GECKODRIVER_VERSION /usr/bin/geckodriver
 
-#========================
-# Selenium Configuration
-#========================
-# As integer, maps to "maxInstances"
-ENV NODE_MAX_INSTANCES 1
-# As integer, maps to "maxSession"
-ENV NODE_MAX_SESSION 1
-# As integer, maps to "port"
-ENV NODE_PORT 5555
-# In milliseconds, maps to "registerCycle"
-ENV NODE_REGISTER_CYCLE 5000
-# In milliseconds, maps to "nodePolling"
-ENV NODE_POLLING 5000
-# In milliseconds, maps to "unregisterIfStillDownAfter"
-ENV NODE_UNREGISTER_IF_STILL_DOWN_AFTER 60000
-# As integer, maps to "downPollingLimit"
-ENV NODE_DOWN_POLLING_LIMIT 2
-# As string, maps to "applicationName"
-ENV NODE_APPLICATION_NAME ""
-
-COPY generate_config /opt/selenium/generate_config
-RUN chmod +x /opt/selenium/generate_config \
-  && chown -R seluser:seluser /opt/selenium
+USER seluser
 
-# Following line fixes https://github.com/SeleniumHQ/docker-selenium/issues/87
-ENV DBUS_SESSION_BUS_ADDRESS=/dev/null
+COPY generate_config /opt/bin/generate_config
 
-USER seluser
+# Running this command as sudo just to avoid the message:
+# To run a command as administrator (user "root"), use "sudo <command>". See "man sudo_root" for details.
+# When logging into the container
+RUN sudo echo ""

From 17e0cc1925c163c3528dfa4e4eb572ec70e8f96e Mon Sep 17 00:00:00 2001
From: Diego Molina <diemol@gmail.com>
Date: Mon, 1 May 2017 21:47:58 +0200
Subject: [PATCH 06/16] File not being used, Dockerfile is taken from NodeDebug
 folder

---
 NodeFirefoxDebug/Dockerfile.txt | 55 ---------------------------------
 1 file changed, 55 deletions(-)
 delete mode 100644 NodeFirefoxDebug/Dockerfile.txt

diff --git a/NodeFirefoxDebug/Dockerfile.txt b/NodeFirefoxDebug/Dockerfile.txt
deleted file mode 100644
index 8cc9718606..0000000000
--- a/NodeFirefoxDebug/Dockerfile.txt
+++ /dev/null
@@ -1,55 +0,0 @@
-FROM selenium/node-firefox:3.4.0-chromium
-MAINTAINER Selenium <selenium-developers@googlegroups.com>
-
-USER root
-
-#=====
-# VNC
-#=====
-RUN apt-get update -qqy \
-  && apt-get -qqy install \
-  x11vnc \
-  && rm -rf /var/lib/apt/lists/* /var/cache/apt/* \
-  && mkdir -p /root/.vnc \
-  && x11vnc -storepasswd secret ~/.vnc/passwd
-
-#=================
-# Locale settings
-#=================
-ENV LANGUAGE en_US.UTF-8
-ENV LANG en_US.UTF-8
-RUN locale-gen en_US.UTF-8 \
-  && dpkg-reconfigure --frontend noninteractive locales \
-  && apt-get update -qqy \
-  && apt-get -qqy --no-install-recommends install \
-    language-pack-en \
-  && rm -rf /var/lib/apt/lists/* /var/cache/apt/*
-
-#=======
-# Fonts
-#=======
-RUN apt-get update -qqy \
-  && apt-get -qqy --no-install-recommends install \
-    fonts-ipafont-gothic \
-    xfonts-100dpi \
-    xfonts-75dpi \
-    xfonts-cyrillic \
-    xfonts-scalable \
-  && 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/*
-
-#==============================
-# Scripts to run Selenium Node
-#==============================
-COPY entry_point.sh /opt/bin/entry_point.sh
-RUN chmod +x /opt/bin/entry_point.sh
-
-EXPOSE 5900

From ec6c7059c79aafa5cda11924a9959f3c04193a2c Mon Sep 17 00:00:00 2001
From: Diego Molina <diemol@gmail.com>
Date: Mon, 1 May 2017 21:49:24 +0200
Subject: [PATCH 07/16] Creating VNC pwd as seluser so the service can be run
 with that user.

---
 NodeDebug/Dockerfile.txt | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/NodeDebug/Dockerfile.txt b/NodeDebug/Dockerfile.txt
index bd75063f75..474b82ac78 100644
--- a/NodeDebug/Dockerfile.txt
+++ b/NodeDebug/Dockerfile.txt
@@ -6,9 +6,7 @@ USER root
 RUN apt-get update -qqy \
   && apt-get -qqy install \
   x11vnc \
-  && rm -rf /var/lib/apt/lists/* /var/cache/apt/* \
-  && mkdir -p /root/.vnc \
-  && x11vnc -storepasswd secret ~/.vnc/passwd
+  && rm -rf /var/lib/apt/lists/* /var/cache/apt/*
 
 #=================
 # Locale settings
@@ -43,10 +41,19 @@ RUN apt-get update -qqy \
     fluxbox \
   && rm -rf /var/lib/apt/lists/* /var/cache/apt/*
 
+USER seluser
+
+#==============================
+# Generating the VNC password as seluser
+# So the service can be started with seluser
+#==============================
+
+RUN mkdir -p ~/.vnc \
+  && x11vnc -storepasswd secret ~/.vnc/passwd
+
 #==============================
 # Scripts to run Selenium Node
 #==============================
 COPY entry_point.sh /opt/bin/entry_point.sh
-RUN chmod +x /opt/bin/entry_point.sh
 
 EXPOSE 5900

From b6ada5191f8f942ce30fdea7107d76c07cc66f0c Mon Sep 17 00:00:00 2001
From: Diego Molina <diemol@gmail.com>
Date: Mon, 1 May 2017 21:50:38 +0200
Subject: [PATCH 08/16] Using new paths and removing logic to export env vars
 from root to seluser, not needed anymore

---
 NodeChromeDebug/entry_point.sh  | 16 +++++-----------
 NodeFirefoxDebug/entry_point.sh | 16 +++++-----------
 2 files changed, 10 insertions(+), 22 deletions(-)
 mode change 100644 => 100755 NodeChromeDebug/entry_point.sh
 mode change 100644 => 100755 NodeFirefoxDebug/entry_point.sh

diff --git a/NodeChromeDebug/entry_point.sh b/NodeChromeDebug/entry_point.sh
old mode 100644
new mode 100755
index a78401991b..a80c343e3b
--- a/NodeChromeDebug/entry_point.sh
+++ b/NodeChromeDebug/entry_point.sh
@@ -1,11 +1,11 @@
 #!/bin/bash
 
 source /opt/bin/functions.sh
-/opt/selenium/generate_config > /opt/selenium/config.json
+/opt/bin/generate_config > /home/seluser/selenium/config.json
 
 export GEOMETRY="$SCREEN_WIDTH""x""$SCREEN_HEIGHT""x""$SCREEN_DEPTH"
 
-if [ ! -e /opt/selenium/config.json ]; then
+if [ ! -e /home/seluser/selenium/config.json ]; then
   echo No Selenium Node configuration file, the node-base image is not intended to be run directly. 1>&2
   exit 1
 fi
@@ -29,22 +29,16 @@ if [ ! -z "$SE_OPTS" ]; then
   echo "appending selenium options: ${SE_OPTS}"
 fi
 
-# TODO: Look into http://www.seleniumhq.org/docs/05_selenium_rc.jsp#browser-side-logs
-
 SERVERNUM=$(get_server_num)
 
 rm -f /tmp/.X*lock
 
-env | cut -f 1 -d "=" | sort > asroot
-  sudo -E -u seluser -i env | cut -f 1 -d "=" | sort > asseluser
-  sudo -E -i -u seluser \
-  "$(for E in $(grep -vxFf asseluser asroot); do echo $E=$(eval echo \$$E); done)" \
-  DISPLAY=$DISPLAY \
+DISPLAY=$DISPLAY \
   xvfb-run -n $SERVERNUM --server-args="-screen 0 $GEOMETRY -ac +extension RANDR" \
-  java ${JAVA_OPTS} -jar /opt/selenium/selenium-server-standalone.jar \
+  java ${JAVA_OPTS} -jar /home/seluser/selenium/selenium-server-standalone.jar \
     -role node \
     -hub http://$HUB_PORT_4444_TCP_ADDR:$HUB_PORT_4444_TCP_PORT/grid/register \
-    -nodeConfig /opt/selenium/config.json \
+    -nodeConfig /home/seluser/selenium/config.json \
     ${SE_OPTS} &
 NODE_PID=$!
 
diff --git a/NodeFirefoxDebug/entry_point.sh b/NodeFirefoxDebug/entry_point.sh
old mode 100644
new mode 100755
index a78401991b..a80c343e3b
--- a/NodeFirefoxDebug/entry_point.sh
+++ b/NodeFirefoxDebug/entry_point.sh
@@ -1,11 +1,11 @@
 #!/bin/bash
 
 source /opt/bin/functions.sh
-/opt/selenium/generate_config > /opt/selenium/config.json
+/opt/bin/generate_config > /home/seluser/selenium/config.json
 
 export GEOMETRY="$SCREEN_WIDTH""x""$SCREEN_HEIGHT""x""$SCREEN_DEPTH"
 
-if [ ! -e /opt/selenium/config.json ]; then
+if [ ! -e /home/seluser/selenium/config.json ]; then
   echo No Selenium Node configuration file, the node-base image is not intended to be run directly. 1>&2
   exit 1
 fi
@@ -29,22 +29,16 @@ if [ ! -z "$SE_OPTS" ]; then
   echo "appending selenium options: ${SE_OPTS}"
 fi
 
-# TODO: Look into http://www.seleniumhq.org/docs/05_selenium_rc.jsp#browser-side-logs
-
 SERVERNUM=$(get_server_num)
 
 rm -f /tmp/.X*lock
 
-env | cut -f 1 -d "=" | sort > asroot
-  sudo -E -u seluser -i env | cut -f 1 -d "=" | sort > asseluser
-  sudo -E -i -u seluser \
-  "$(for E in $(grep -vxFf asseluser asroot); do echo $E=$(eval echo \$$E); done)" \
-  DISPLAY=$DISPLAY \
+DISPLAY=$DISPLAY \
   xvfb-run -n $SERVERNUM --server-args="-screen 0 $GEOMETRY -ac +extension RANDR" \
-  java ${JAVA_OPTS} -jar /opt/selenium/selenium-server-standalone.jar \
+  java ${JAVA_OPTS} -jar /home/seluser/selenium/selenium-server-standalone.jar \
     -role node \
     -hub http://$HUB_PORT_4444_TCP_ADDR:$HUB_PORT_4444_TCP_PORT/grid/register \
-    -nodeConfig /opt/selenium/config.json \
+    -nodeConfig /home/seluser/selenium/config.json \
     ${SE_OPTS} &
 NODE_PID=$!
 

From 030448796ff98bec1a26c022b71026633e2fc331 Mon Sep 17 00:00:00 2001
From: Diego Molina <diemol@gmail.com>
Date: Mon, 1 May 2017 22:31:37 +0200
Subject: [PATCH 09/16] Central entry_point.sh for the debug images

---
 NodeDebug/entry_point.sh | 60 ++++++++++++++++++++++++++++++++++++++++
 NodeDebug/generate.sh    |  1 +
 2 files changed, 61 insertions(+)
 create mode 100755 NodeDebug/entry_point.sh

diff --git a/NodeDebug/entry_point.sh b/NodeDebug/entry_point.sh
new file mode 100755
index 0000000000..a80c343e3b
--- /dev/null
+++ b/NodeDebug/entry_point.sh
@@ -0,0 +1,60 @@
+#!/bin/bash
+
+source /opt/bin/functions.sh
+/opt/bin/generate_config > /home/seluser/selenium/config.json
+
+export GEOMETRY="$SCREEN_WIDTH""x""$SCREEN_HEIGHT""x""$SCREEN_DEPTH"
+
+if [ ! -e /home/seluser/selenium/config.json ]; then
+  echo No Selenium Node configuration file, the node-base image is not intended to be run directly. 1>&2
+  exit 1
+fi
+
+if [ -z "$HUB_PORT_4444_TCP_ADDR" ]; then
+  echo Not linked with a running Hub container 1>&2
+  exit 1
+fi
+
+function shutdown {
+  kill -s SIGTERM $NODE_PID
+  wait $NODE_PID
+}
+
+if [ ! -z "$REMOTE_HOST" ]; then
+  >&2 echo "REMOTE_HOST variable is *DEPRECATED* in these docker containers.  Please use SE_OPTS=\"-host <host> -port <port>\" instead!"
+  exit 1
+fi
+
+if [ ! -z "$SE_OPTS" ]; then
+  echo "appending selenium options: ${SE_OPTS}"
+fi
+
+SERVERNUM=$(get_server_num)
+
+rm -f /tmp/.X*lock
+
+DISPLAY=$DISPLAY \
+  xvfb-run -n $SERVERNUM --server-args="-screen 0 $GEOMETRY -ac +extension RANDR" \
+  java ${JAVA_OPTS} -jar /home/seluser/selenium/selenium-server-standalone.jar \
+    -role node \
+    -hub http://$HUB_PORT_4444_TCP_ADDR:$HUB_PORT_4444_TCP_PORT/grid/register \
+    -nodeConfig /home/seluser/selenium/config.json \
+    ${SE_OPTS} &
+NODE_PID=$!
+
+trap shutdown SIGTERM SIGINT
+for i in $(seq 1 10)
+do
+  xdpyinfo -display $DISPLAY >/dev/null 2>&1
+  if [ $? -eq 0 ]; then
+    break
+  fi
+  echo Waiting xvfb...
+  sleep 0.5
+done
+
+fluxbox -display $DISPLAY &
+
+x11vnc -forever -usepw -shared -rfbport 5900 -display $DISPLAY &
+
+wait $NODE_PID
diff --git a/NodeDebug/generate.sh b/NodeDebug/generate.sh
index 3ce9ea9d0e..7381e4a29b 100755
--- a/NodeDebug/generate.sh
+++ b/NodeDebug/generate.sh
@@ -21,3 +21,4 @@ cat ./README.template.md \
   | sed "s/##FOLDER##/$1/" > $FOLDER/README.md
 
 cp ./README-short.txt $FOLDER/README-short.txt
+cp ./entry_point.sh $FOLDER/entry_point.sh

From 303e571e5c92b3db1d53ebca896398b2f402a20a Mon Sep 17 00:00:00 2001
From: Diego Molina <diemol@gmail.com>
Date: Mon, 1 May 2017 22:33:25 +0200
Subject: [PATCH 10/16] Adopting new path and using seluser from the beginning

---
 Standalone/Dockerfile.txt        | 5 +----
 Standalone/entry_point.sh        | 2 +-
 StandaloneChrome/entry_point.sh  | 2 +-
 StandaloneFirefox/entry_point.sh | 2 +-
 4 files changed, 4 insertions(+), 7 deletions(-)
 mode change 100644 => 100755 Standalone/entry_point.sh
 mode change 100644 => 100755 StandaloneChrome/entry_point.sh
 mode change 100644 => 100755 StandaloneFirefox/entry_point.sh

diff --git a/Standalone/Dockerfile.txt b/Standalone/Dockerfile.txt
index 82cc55a230..c958c5f935 100644
--- a/Standalone/Dockerfile.txt
+++ b/Standalone/Dockerfile.txt
@@ -1,11 +1,8 @@
-USER root
+USER seluser
 
 #====================================
 # Scripts to run Selenium Standalone
 #====================================
 COPY entry_point.sh /opt/bin/entry_point.sh
-RUN chmod +x /opt/bin/entry_point.sh
-
-USER seluser
 
 EXPOSE 4444
diff --git a/Standalone/entry_point.sh b/Standalone/entry_point.sh
old mode 100644
new mode 100755
index 73c7527642..5d2d6f276b
--- a/Standalone/entry_point.sh
+++ b/Standalone/entry_point.sh
@@ -18,7 +18,7 @@ SERVERNUM=$(get_server_num)
 rm -f /tmp/.X*lock
 
 xvfb-run -n $SERVERNUM --server-args="-screen 0 $GEOMETRY -ac +extension RANDR" \
-  java ${JAVA_OPTS} -jar /opt/selenium/selenium-server-standalone.jar \
+  java ${JAVA_OPTS} -jar /home/seluser/selenium/selenium-server-standalone.jar \
   ${SE_OPTS} &
 NODE_PID=$!
 
diff --git a/StandaloneChrome/entry_point.sh b/StandaloneChrome/entry_point.sh
old mode 100644
new mode 100755
index 73c7527642..5d2d6f276b
--- a/StandaloneChrome/entry_point.sh
+++ b/StandaloneChrome/entry_point.sh
@@ -18,7 +18,7 @@ SERVERNUM=$(get_server_num)
 rm -f /tmp/.X*lock
 
 xvfb-run -n $SERVERNUM --server-args="-screen 0 $GEOMETRY -ac +extension RANDR" \
-  java ${JAVA_OPTS} -jar /opt/selenium/selenium-server-standalone.jar \
+  java ${JAVA_OPTS} -jar /home/seluser/selenium/selenium-server-standalone.jar \
   ${SE_OPTS} &
 NODE_PID=$!
 
diff --git a/StandaloneFirefox/entry_point.sh b/StandaloneFirefox/entry_point.sh
old mode 100644
new mode 100755
index 73c7527642..5d2d6f276b
--- a/StandaloneFirefox/entry_point.sh
+++ b/StandaloneFirefox/entry_point.sh
@@ -18,7 +18,7 @@ SERVERNUM=$(get_server_num)
 rm -f /tmp/.X*lock
 
 xvfb-run -n $SERVERNUM --server-args="-screen 0 $GEOMETRY -ac +extension RANDR" \
-  java ${JAVA_OPTS} -jar /opt/selenium/selenium-server-standalone.jar \
+  java ${JAVA_OPTS} -jar /home/seluser/selenium/selenium-server-standalone.jar \
   ${SE_OPTS} &
 NODE_PID=$!
 

From 02c909e22cef3f5b5be792e95aa0309469942eca Mon Sep 17 00:00:00 2001
From: Diego Molina <diemol@gmail.com>
Date: Mon, 1 May 2017 22:58:12 +0200
Subject: [PATCH 11/16] Adding note about which file to modify.

---
 NodeDebug/entry_point.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/NodeDebug/entry_point.sh b/NodeDebug/entry_point.sh
index a80c343e3b..56125ea419 100755
--- a/NodeDebug/entry_point.sh
+++ b/NodeDebug/entry_point.sh
@@ -1,4 +1,6 @@
 #!/bin/bash
+#
+# IMPORTANT: Change this file only in directory NodeDebug!
 
 source /opt/bin/functions.sh
 /opt/bin/generate_config > /home/seluser/selenium/config.json

From 225fb30f48282946b72807ef4ef31b2068baea4c Mon Sep 17 00:00:00 2001
From: Diego Molina <diemol@gmail.com>
Date: Mon, 1 May 2017 22:59:57 +0200
Subject: [PATCH 12/16] Removing unneeded logic to copy env vars from root to
 seluser since they already exist in the seluser env. Also adopting new paths.

---
 StandaloneDebug/entry_point.sh | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)
 mode change 100644 => 100755 StandaloneDebug/entry_point.sh

diff --git a/StandaloneDebug/entry_point.sh b/StandaloneDebug/entry_point.sh
old mode 100644
new mode 100755
index 91ab09d899..75a019341c
--- a/StandaloneDebug/entry_point.sh
+++ b/StandaloneDebug/entry_point.sh
@@ -18,18 +18,10 @@ fi
 rm -f /tmp/.X*lock
 
 SERVERNUM=$(get_server_num)
-env | cut -f 1 -d "=" | sort > asroot
-sudo -E -u seluser -i env | cut -f 1 -d "=" | sort > asseluser
 
-# Add root environment variables that are not present in the seluser
-# environment to an environment file.
-"$(for E in $(grep -vxFf asseluser asroot); do echo $E="'${!E}'" >> ~seluser/selenv; done)" \
-echo "DISPLAY=${DISPLAY}" >> ~seluser/selenv
-
-sudo -E -i -u seluser \
-  source selenv && \
+DISPLAY=$DISPLAY \
   xvfb-run -n $SERVERNUM --server-args="-screen 0 $GEOMETRY -ac +extension RANDR" \
-  java ${JAVA_OPTS} -jar /opt/selenium/selenium-server-standalone.jar \
+  java ${JAVA_OPTS} -jar /home/seluser/selenium/selenium-server-standalone.jar \
   ${SE_OPTS} &
 NODE_PID=$!
 

From f61783bc2ebbbdbb3ab79a9baa4e9db48b445274 Mon Sep 17 00:00:00 2001
From: Diego Molina <diemol@gmail.com>
Date: Mon, 1 May 2017 23:01:13 +0200
Subject: [PATCH 13/16] Generating StandaloneDebug images from NodeDebug
 images, which speeds up the build and reduces duplicated config.

---
 Makefile                    | 4 ++--
 StandaloneDebug/generate.sh | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index f8c6807172..e248a901e3 100644
--- a/Makefile
+++ b/Makefile
@@ -61,7 +61,7 @@ standalone_firefox: generate_standalone_firefox firefox
 	cd ./StandaloneFirefox && docker build $(BUILD_ARGS) -t $(NAME)/standalone-firefox:$(VERSION) .
 
 generate_standalone_firefox_debug:
-	cd ./StandaloneDebug && ./generate.sh StandaloneFirefoxDebug standalone-firefox Firefox $(VERSION) $(NAMESPACE) $(AUTHORS)
+	cd ./StandaloneDebug && ./generate.sh StandaloneFirefoxDebug node-firefox-debug Firefox $(VERSION) $(NAMESPACE) $(AUTHORS)
 
 standalone_firefox_debug: generate_standalone_firefox_debug standalone_firefox
 	cd ./StandaloneFirefoxDebug && docker build $(BUILD_ARGS) -t $(NAME)/standalone-firefox-debug:$(VERSION) .
@@ -73,7 +73,7 @@ standalone_chrome: generate_standalone_chrome chrome
 	cd ./StandaloneChrome && docker build $(BUILD_ARGS) -t $(NAME)/standalone-chrome:$(VERSION) .
 
 generate_standalone_chrome_debug:
-	cd ./StandaloneDebug && ./generate.sh StandaloneChromeDebug standalone-chrome Chrome $(VERSION) $(NAMESPACE) $(AUTHORS)
+	cd ./StandaloneDebug && ./generate.sh StandaloneChromeDebug node-chrome-debug Chrome $(VERSION) $(NAMESPACE) $(AUTHORS)
 
 standalone_chrome_debug: generate_standalone_chrome_debug standalone_chrome
 	cd ./StandaloneChromeDebug && docker build $(BUILD_ARGS) -t $(NAME)/standalone-chrome-debug:$(VERSION) .
diff --git a/StandaloneDebug/generate.sh b/StandaloneDebug/generate.sh
index 16ef29f69f..5a45ab0264 100755
--- a/StandaloneDebug/generate.sh
+++ b/StandaloneDebug/generate.sh
@@ -13,7 +13,8 @@ echo "# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" >> $FOLDER/Dockerfil
 echo FROM $NAMESPACE/$BASE:$VERSION >> $FOLDER/Dockerfile
 echo LABEL authors="$AUTHORS" >> $FOLDER/Dockerfile
 echo "" >> $FOLDER/Dockerfile
-cat ../NodeDebug/Dockerfile.txt >> $FOLDER/Dockerfile
+cat ../Standalone/Dockerfile.txt >> $FOLDER/Dockerfile
+echo EXPOSE 5900 >> $FOLDER/Dockerfile
 
 cp ./entry_point.sh $FOLDER
 

From b0a199184e4224b41bee421c922e92113dbd2898 Mon Sep 17 00:00:00 2001
From: Diego Molina <diemol@gmail.com>
Date: Tue, 2 May 2017 12:17:48 +0200
Subject: [PATCH 14/16] Fixing path for PhantomJS build.

---
 NodePhantomJS/Dockerfile.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/NodePhantomJS/Dockerfile.txt b/NodePhantomJS/Dockerfile.txt
index 2f8d8e0a32..928f45ee55 100644
--- a/NodePhantomJS/Dockerfile.txt
+++ b/NodePhantomJS/Dockerfile.txt
@@ -7,7 +7,7 @@ RUN apt-get update -y
 RUN apt-get install bzip2 libfreetype6 libfontconfig1  -y
 RUN wget https://bitbucket.org/ariya/phantomjs/downloads/phantomjs-1.9.8-linux-x86_64.tar.bz2
 RUN tar -xvjf phantomjs-1.9.8-linux-x86_64.tar.bz2 && rm phantomjs-1.9.8-linux-x86_64.tar.bz2
-RUN mv /phantomjs-1.9.8-linux-x86_64 /usr/local/phantomjs-1.9.8-linux-x86_64
+RUN mv phantomjs-1.9.8-linux-x86_64 /usr/local/phantomjs-1.9.8-linux-x86_64
 RUN ln -s /usr/local/phantomjs-1.9.8-linux-x86_64/bin/phantomjs /usr/local/bin/phantomjs
 
 #==============================

From 0f12883b3deac2a1bc63552a98f51704a07e288c Mon Sep 17 00:00:00 2001
From: Diego Molina <diemol@gmail.com>
Date: Tue, 2 May 2017 23:34:50 +0200
Subject: [PATCH 15/16] Switching back to the previous Selenium files path.

---
 Base/Dockerfile                |  6 +++---
 Hub/Dockerfile.txt             |  2 +-
 Hub/entry_point.sh             |  4 ++--
 NodeBase/entry_point.sh        |  8 ++++----
 NodeChrome/Dockerfile.txt      | 10 +++++-----
 NodeDebug/entry_point.sh       |  8 ++++----
 Standalone/entry_point.sh      |  4 +++-
 StandaloneDebug/entry_point.sh |  2 +-
 8 files changed, 23 insertions(+), 21 deletions(-)

diff --git a/Base/Dockerfile b/Base/Dockerfile
index e42a8cbafd..78d07283cf 100644
--- a/Base/Dockerfile
+++ b/Base/Dockerfile
@@ -50,12 +50,12 @@ RUN useradd seluser \
 # Run the following commands as non-privileged user
 #===================================================
 USER seluser
-WORKDIR /home/seluser
 
 #==========
 # Selenium
 #==========
-RUN  mkdir -p /home/seluser/selenium \
+RUN  sudo mkdir -p /opt/selenium \
+  && sudo chown seluser:seluser /opt/selenium \
   && wget --no-verbose https://selenium-release.storage.googleapis.com/3.4/selenium-server-standalone-3.4.0.jar \
-    -O /home/seluser/selenium/selenium-server-standalone.jar
+    -O /opt/selenium/selenium-server-standalone.jar
 
diff --git a/Hub/Dockerfile.txt b/Hub/Dockerfile.txt
index 01dc8dc721..f2f7417e59 100644
--- a/Hub/Dockerfile.txt
+++ b/Hub/Dockerfile.txt
@@ -29,6 +29,6 @@ COPY generate_config \
 # Running this command as sudo just to avoid the message:
 # To run a command as administrator (user "root"), use "sudo <command>". See "man sudo_root" for details.
 # When logging into the container
-RUN sudo /opt/bin/generate_config > /home/seluser/selenium/config.json
+RUN sudo /opt/bin/generate_config > /opt/selenium/config.json
 
 CMD ["/opt/bin/entry_point.sh"]
diff --git a/Hub/entry_point.sh b/Hub/entry_point.sh
index b95efbaf07..1da299b1e7 100755
--- a/Hub/entry_point.sh
+++ b/Hub/entry_point.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-ROOT=/home/seluser/selenium
+ROOT=/opt/selenium
 CONF=$ROOT/config.json
 
 /opt/bin/generate_config >$CONF
@@ -19,7 +19,7 @@ function shutdown {
     echo "shutdown complete"
 }
 
-java ${JAVA_OPTS} -jar /home/seluser/selenium/selenium-server-standalone.jar \
+java ${JAVA_OPTS} -jar /opt/selenium/selenium-server-standalone.jar \
   -role hub \
   -hubConfig $CONF \
   ${SE_OPTS} &
diff --git a/NodeBase/entry_point.sh b/NodeBase/entry_point.sh
index 8be14d8c01..3518881ddb 100755
--- a/NodeBase/entry_point.sh
+++ b/NodeBase/entry_point.sh
@@ -1,11 +1,11 @@
 #!/bin/bash
 
 source /opt/bin/functions.sh
-/opt/bin/generate_config > /home/seluser/selenium/config.json
+/opt/bin/generate_config > /opt/selenium/config.json
 
 export GEOMETRY="$SCREEN_WIDTH""x""$SCREEN_HEIGHT""x""$SCREEN_DEPTH"
 
-if [ ! -e /home/seluser/selenium/config.json ]; then
+if [ ! -e /opt/selenium/config.json ]; then
   echo No Selenium Node configuration file, the node-base image is not intended to be run directly. 1>&2
   exit 1
 fi
@@ -34,10 +34,10 @@ SERVERNUM=$(get_server_num)
 rm -f /tmp/.X*lock
 
 xvfb-run -n $SERVERNUM --server-args="-screen 0 $GEOMETRY -ac +extension RANDR" \
-  java ${JAVA_OPTS} -jar /home/seluser/selenium/selenium-server-standalone.jar \
+  java ${JAVA_OPTS} -jar /opt/selenium/selenium-server-standalone.jar \
     -role node \
     -hub http://$HUB_PORT_4444_TCP_ADDR:$HUB_PORT_4444_TCP_PORT/grid/register \
-    -nodeConfig /home/seluser/selenium/config.json \
+    -nodeConfig /opt/selenium/config.json \
     ${SE_OPTS} &
 NODE_PID=$!
 
diff --git a/NodeChrome/Dockerfile.txt b/NodeChrome/Dockerfile.txt
index e462e0d7dc..7885567724 100644
--- a/NodeChrome/Dockerfile.txt
+++ b/NodeChrome/Dockerfile.txt
@@ -26,12 +26,12 @@ USER seluser
 #==================
 ARG CHROME_DRIVER_VERSION=2.29
 RUN wget --no-verbose -O /tmp/chromedriver_linux64.zip https://chromedriver.storage.googleapis.com/$CHROME_DRIVER_VERSION/chromedriver_linux64.zip \
-  && rm -rf /home/seluser/selenium/chromedriver \
-  && unzip /tmp/chromedriver_linux64.zip -d /home/seluser/selenium \
+  && rm -rf /opt/selenium/chromedriver \
+  && unzip /tmp/chromedriver_linux64.zip -d /opt/selenium \
   && rm /tmp/chromedriver_linux64.zip \
-  && mv /home/seluser/selenium/chromedriver /home/seluser/selenium/chromedriver-$CHROME_DRIVER_VERSION \
-  && chmod 755 /home/seluser/selenium/chromedriver-$CHROME_DRIVER_VERSION \
-  && sudo ln -fs /home/seluser/selenium/chromedriver-$CHROME_DRIVER_VERSION /usr/bin/chromedriver
+  && mv /opt/selenium/chromedriver /opt/selenium/chromedriver-$CHROME_DRIVER_VERSION \
+  && chmod 755 /opt/selenium/chromedriver-$CHROME_DRIVER_VERSION \
+  && sudo ln -fs /opt/selenium/chromedriver-$CHROME_DRIVER_VERSION /usr/bin/chromedriver
 
 COPY generate_config /opt/bin/generate_config
 
diff --git a/NodeDebug/entry_point.sh b/NodeDebug/entry_point.sh
index 56125ea419..e73449efd8 100755
--- a/NodeDebug/entry_point.sh
+++ b/NodeDebug/entry_point.sh
@@ -3,11 +3,11 @@
 # IMPORTANT: Change this file only in directory NodeDebug!
 
 source /opt/bin/functions.sh
-/opt/bin/generate_config > /home/seluser/selenium/config.json
+/opt/bin/generate_config > /opt/selenium/config.json
 
 export GEOMETRY="$SCREEN_WIDTH""x""$SCREEN_HEIGHT""x""$SCREEN_DEPTH"
 
-if [ ! -e /home/seluser/selenium/config.json ]; then
+if [ ! -e /opt/selenium/config.json ]; then
   echo No Selenium Node configuration file, the node-base image is not intended to be run directly. 1>&2
   exit 1
 fi
@@ -37,10 +37,10 @@ rm -f /tmp/.X*lock
 
 DISPLAY=$DISPLAY \
   xvfb-run -n $SERVERNUM --server-args="-screen 0 $GEOMETRY -ac +extension RANDR" \
-  java ${JAVA_OPTS} -jar /home/seluser/selenium/selenium-server-standalone.jar \
+  java ${JAVA_OPTS} -jar /opt/selenium/selenium-server-standalone.jar \
     -role node \
     -hub http://$HUB_PORT_4444_TCP_ADDR:$HUB_PORT_4444_TCP_PORT/grid/register \
-    -nodeConfig /home/seluser/selenium/config.json \
+    -nodeConfig /opt/selenium/config.json \
     ${SE_OPTS} &
 NODE_PID=$!
 
diff --git a/Standalone/entry_point.sh b/Standalone/entry_point.sh
index 5d2d6f276b..fc59b27d26 100755
--- a/Standalone/entry_point.sh
+++ b/Standalone/entry_point.sh
@@ -1,4 +1,6 @@
 #!/bin/bash
+#
+# IMPORTANT: Change this file only in directory Standalone!
 
 source /opt/bin/functions.sh
 
@@ -18,7 +20,7 @@ SERVERNUM=$(get_server_num)
 rm -f /tmp/.X*lock
 
 xvfb-run -n $SERVERNUM --server-args="-screen 0 $GEOMETRY -ac +extension RANDR" \
-  java ${JAVA_OPTS} -jar /home/seluser/selenium/selenium-server-standalone.jar \
+  java ${JAVA_OPTS} -jar /opt/selenium/selenium-server-standalone.jar \
   ${SE_OPTS} &
 NODE_PID=$!
 
diff --git a/StandaloneDebug/entry_point.sh b/StandaloneDebug/entry_point.sh
index 75a019341c..ac13cb814d 100755
--- a/StandaloneDebug/entry_point.sh
+++ b/StandaloneDebug/entry_point.sh
@@ -21,7 +21,7 @@ SERVERNUM=$(get_server_num)
 
 DISPLAY=$DISPLAY \
   xvfb-run -n $SERVERNUM --server-args="-screen 0 $GEOMETRY -ac +extension RANDR" \
-  java ${JAVA_OPTS} -jar /home/seluser/selenium/selenium-server-standalone.jar \
+  java ${JAVA_OPTS} -jar /opt/selenium/selenium-server-standalone.jar \
   ${SE_OPTS} &
 NODE_PID=$!
 

From cff331517ecef5206a00b6a8f7ae120a628ce40d Mon Sep 17 00:00:00 2001
From: Diego Molina <diemol@gmail.com>
Date: Tue, 2 May 2017 23:42:57 +0200
Subject: [PATCH 16/16] Switching back to the previous Selenium files path (2)

---
 NodeChromeDebug/entry_point.sh   | 10 ++++++----
 NodeFirefoxDebug/entry_point.sh  | 10 ++++++----
 StandaloneChrome/entry_point.sh  |  4 +++-
 StandaloneFirefox/entry_point.sh |  4 +++-
 4 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/NodeChromeDebug/entry_point.sh b/NodeChromeDebug/entry_point.sh
index a80c343e3b..e73449efd8 100755
--- a/NodeChromeDebug/entry_point.sh
+++ b/NodeChromeDebug/entry_point.sh
@@ -1,11 +1,13 @@
 #!/bin/bash
+#
+# IMPORTANT: Change this file only in directory NodeDebug!
 
 source /opt/bin/functions.sh
-/opt/bin/generate_config > /home/seluser/selenium/config.json
+/opt/bin/generate_config > /opt/selenium/config.json
 
 export GEOMETRY="$SCREEN_WIDTH""x""$SCREEN_HEIGHT""x""$SCREEN_DEPTH"
 
-if [ ! -e /home/seluser/selenium/config.json ]; then
+if [ ! -e /opt/selenium/config.json ]; then
   echo No Selenium Node configuration file, the node-base image is not intended to be run directly. 1>&2
   exit 1
 fi
@@ -35,10 +37,10 @@ rm -f /tmp/.X*lock
 
 DISPLAY=$DISPLAY \
   xvfb-run -n $SERVERNUM --server-args="-screen 0 $GEOMETRY -ac +extension RANDR" \
-  java ${JAVA_OPTS} -jar /home/seluser/selenium/selenium-server-standalone.jar \
+  java ${JAVA_OPTS} -jar /opt/selenium/selenium-server-standalone.jar \
     -role node \
     -hub http://$HUB_PORT_4444_TCP_ADDR:$HUB_PORT_4444_TCP_PORT/grid/register \
-    -nodeConfig /home/seluser/selenium/config.json \
+    -nodeConfig /opt/selenium/config.json \
     ${SE_OPTS} &
 NODE_PID=$!
 
diff --git a/NodeFirefoxDebug/entry_point.sh b/NodeFirefoxDebug/entry_point.sh
index a80c343e3b..e73449efd8 100755
--- a/NodeFirefoxDebug/entry_point.sh
+++ b/NodeFirefoxDebug/entry_point.sh
@@ -1,11 +1,13 @@
 #!/bin/bash
+#
+# IMPORTANT: Change this file only in directory NodeDebug!
 
 source /opt/bin/functions.sh
-/opt/bin/generate_config > /home/seluser/selenium/config.json
+/opt/bin/generate_config > /opt/selenium/config.json
 
 export GEOMETRY="$SCREEN_WIDTH""x""$SCREEN_HEIGHT""x""$SCREEN_DEPTH"
 
-if [ ! -e /home/seluser/selenium/config.json ]; then
+if [ ! -e /opt/selenium/config.json ]; then
   echo No Selenium Node configuration file, the node-base image is not intended to be run directly. 1>&2
   exit 1
 fi
@@ -35,10 +37,10 @@ rm -f /tmp/.X*lock
 
 DISPLAY=$DISPLAY \
   xvfb-run -n $SERVERNUM --server-args="-screen 0 $GEOMETRY -ac +extension RANDR" \
-  java ${JAVA_OPTS} -jar /home/seluser/selenium/selenium-server-standalone.jar \
+  java ${JAVA_OPTS} -jar /opt/selenium/selenium-server-standalone.jar \
     -role node \
     -hub http://$HUB_PORT_4444_TCP_ADDR:$HUB_PORT_4444_TCP_PORT/grid/register \
-    -nodeConfig /home/seluser/selenium/config.json \
+    -nodeConfig /opt/selenium/config.json \
     ${SE_OPTS} &
 NODE_PID=$!
 
diff --git a/StandaloneChrome/entry_point.sh b/StandaloneChrome/entry_point.sh
index 5d2d6f276b..fc59b27d26 100755
--- a/StandaloneChrome/entry_point.sh
+++ b/StandaloneChrome/entry_point.sh
@@ -1,4 +1,6 @@
 #!/bin/bash
+#
+# IMPORTANT: Change this file only in directory Standalone!
 
 source /opt/bin/functions.sh
 
@@ -18,7 +20,7 @@ SERVERNUM=$(get_server_num)
 rm -f /tmp/.X*lock
 
 xvfb-run -n $SERVERNUM --server-args="-screen 0 $GEOMETRY -ac +extension RANDR" \
-  java ${JAVA_OPTS} -jar /home/seluser/selenium/selenium-server-standalone.jar \
+  java ${JAVA_OPTS} -jar /opt/selenium/selenium-server-standalone.jar \
   ${SE_OPTS} &
 NODE_PID=$!
 
diff --git a/StandaloneFirefox/entry_point.sh b/StandaloneFirefox/entry_point.sh
index 5d2d6f276b..fc59b27d26 100755
--- a/StandaloneFirefox/entry_point.sh
+++ b/StandaloneFirefox/entry_point.sh
@@ -1,4 +1,6 @@
 #!/bin/bash
+#
+# IMPORTANT: Change this file only in directory Standalone!
 
 source /opt/bin/functions.sh
 
@@ -18,7 +20,7 @@ SERVERNUM=$(get_server_num)
 rm -f /tmp/.X*lock
 
 xvfb-run -n $SERVERNUM --server-args="-screen 0 $GEOMETRY -ac +extension RANDR" \
-  java ${JAVA_OPTS} -jar /home/seluser/selenium/selenium-server-standalone.jar \
+  java ${JAVA_OPTS} -jar /opt/selenium/selenium-server-standalone.jar \
   ${SE_OPTS} &
 NODE_PID=$!