remove xvfb stuff from nodedebug generation script; add tzdata, locales

Author: ddavison

Base/Dockerfile

@@ -8,14 +8,6 @@ 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
 
-#===================
-# Timezone settings
-# Possible alternative: https://github.com/docker/docker/issues/3359#issuecomment-32150214
-#===================
-ENV TZ "UTC"
-RUN echo "${TZ}" > /etc/timezone \
-  && dpkg-reconfigure --frontend noninteractive tzdata
-
 #========================
 # Miscellaneous packages
 # Includes minimal runtime used for executing non GUI Java programs
@@ -25,12 +17,21 @@ RUN apt-get update -qqy \
     bzip2 \
     ca-certificates \
     openjdk-8-jre-headless \
+    tzdata \
     sudo \
     unzip \
     wget \
   && rm -rf /var/lib/apt/lists/* /var/cache/apt/* \
   && sed -i 's/securerandom\.source=file:\/dev\/random/securerandom\.source=file:\/dev\/urandom/' ./usr/lib/jvm/java-8-openjdk-amd64/jre/lib/security/java.security
 
+#===================
+# Timezone settings
+# Possible alternative: https://github.com/docker/docker/issues/3359#issuecomment-32150214
+#===================
+ENV TZ "UTC"
+RUN echo "${TZ}" > /etc/timezone \
+  && dpkg-reconfigure --frontend noninteractive tzdata
+
 #==========
 # Selenium
 #==========

NodeBase/Dockerfile

@@ -13,6 +13,7 @@ ENV DEBCONF_NONINTERACTIVE_SEEN true
 #==============
 RUN apt-get update -qqy \
   && apt-get -qqy install \
+    locales \
     xvfb \
   && rm -rf /var/lib/apt/lists/* /var/cache/apt/*
 

NodeBase/Dockerfile.txt

@@ -8,6 +8,7 @@ ENV DEBCONF_NONINTERACTIVE_SEEN true
 #==============
 RUN apt-get update -qqy \
   && apt-get -qqy install \
+    locales \
     xvfb \
   && rm -rf /var/lib/apt/lists/* /var/cache/apt/*
 

NodeChromeDebug/entry_point.sh

@@ -36,9 +36,9 @@ 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)" \
+  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 \
   xvfb-run -n $SERVERNUM --server-args="-screen 0 $GEOMETRY -ac +extension RANDR" \
   java ${JAVA_OPTS} -jar /opt/selenium/selenium-server-standalone.jar \

NodeDebug/generate.sh

@@ -11,30 +11,6 @@ echo "# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" >> $FOLDER/Dockerfil
 echo FROM selenium/$BASE:$VERSION >> $FOLDER/Dockerfile
 cat ./Dockerfile.txt >> $FOLDER/Dockerfile
 
-cat ../NodeBase/entry_point.sh \
-  | sed 's/^xvfb-run/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 \\\
-  xvfb-run/' \
-  | sed 's/^wait \$NODE_PID/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/' \
-  > $FOLDER/entry_point.sh
-
 cat ./README.template.md \
   | sed "s/##BROWSER##/$BROWSER/" \
   | sed "s/##BASE##/$BASE/" \