Merge pull request SeleniumHQ#292 from SeleniumHQ/fix-vnc

Fix vnc

Author: ddavison

NodeChromeDebug/Dockerfile

@@ -13,14 +13,9 @@ USER root
 RUN apt-get update -qqy \
   && apt-get -qqy install \
   x11vnc \
-  && rm -rf /var/lib/apt/lists/*
-
-USER seluser
-
-RUN mkdir -p ~/.vnc \
- && x11vnc -storepasswd secret ~/.vnc/passwd
-
-USER root
+  && rm -rf /var/lib/apt/lists/* \
+  && mkdir -p /root/.vnc \
+  && x11vnc -storepasswd secret ~/.vnc/passwd
 
 #=================
 # Locale settings

NodeDebug/Dockerfile.txt

@@ -8,14 +8,9 @@ USER root
 RUN apt-get update -qqy \
   && apt-get -qqy install \
   x11vnc \
-  && rm -rf /var/lib/apt/lists/*
-
-USER seluser
-
-RUN mkdir -p ~/.vnc \
- && x11vnc -storepasswd secret ~/.vnc/passwd
-
-USER root
+  && rm -rf /var/lib/apt/lists/* \
+  && mkdir -p /root/.vnc \
+  && x11vnc -storepasswd secret ~/.vnc/passwd
 
 #=================
 # Locale settings

NodeFirefoxDebug/Dockerfile

@@ -13,14 +13,9 @@ USER root
 RUN apt-get update -qqy \
   && apt-get -qqy install \
   x11vnc \
-  && rm -rf /var/lib/apt/lists/*
-
-USER seluser
-
-RUN mkdir -p ~/.vnc \
- && x11vnc -storepasswd secret ~/.vnc/passwd
-
-USER root
+  && rm -rf /var/lib/apt/lists/* \
+  && mkdir -p /root/.vnc \
+  && x11vnc -storepasswd secret ~/.vnc/passwd
 
 #=================
 # Locale settings

NodeFirefoxDebug/Dockerfile.txt

@@ -8,15 +8,10 @@ USER root
 #=====
 RUN apt-get update -qqy \
   && apt-get -qqy install \
-    x11vnc \
-  && rm -rf /var/lib/apt/lists/*
-
-USER seluser
-
-RUN mkdir -p ~/.vnc \
-&& x11vnc -storepasswd secret ~/.vnc/passwd
-
-USER root
+  x11vnc \
+  && rm -rf /var/lib/apt/lists/* \
+  && mkdir -p /root/.vnc \
+  && x11vnc -storepasswd secret ~/.vnc/passwd
 
 #=================
 # Locale settings

StandaloneChromeDebug/Dockerfile

@@ -13,14 +13,9 @@ USER root
 RUN apt-get update -qqy \
   && apt-get -qqy install \
   x11vnc \
-  && rm -rf /var/lib/apt/lists/*
-
-USER seluser
-
-RUN mkdir -p ~/.vnc \
- && x11vnc -storepasswd secret ~/.vnc/passwd
-
-USER root
+  && rm -rf /var/lib/apt/lists/* \
+  && mkdir -p /root/.vnc \
+  && x11vnc -storepasswd secret ~/.vnc/passwd
 
 #=================
 # Locale settings

StandaloneDebug/clear_x_locks.sh

@@ -2,7 +2,6 @@
 #
 # IMPORTANT: Change this file only in directory StandaloneDebug!
 
-source /opt/bin/clear_x_locks.sh
 source /opt/bin/functions.sh
 
 export GEOMETRY="$SCREEN_WIDTH""x""$SCREEN_HEIGHT""x""$SCREEN_DEPTH"
@@ -16,6 +15,8 @@ if [ ! -z "$SE_OPTS" ]; then
   echo "appending selenium options: ${SE_OPTS}"
 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

StandaloneDebug/entry_point.sh

@@ -11,8 +11,7 @@ echo "# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" >> $FOLDER/Dockerfil
 echo FROM selenium/$BASE:$VERSION >> $FOLDER/Dockerfile
 cat ../NodeDebug/Dockerfile.txt >> $FOLDER/Dockerfile
 
-cp ./clear_x_locks.sh \
-   ./entry_point.sh $FOLDER
+cp ./entry_point.sh $FOLDER
 
 BROWSER_LC=$(echo $BROWSER |  tr '[:upper:]' '[:lower:]')
 

StandaloneDebug/generate.sh

@@ -13,14 +13,9 @@ USER root
 RUN apt-get update -qqy \
   && apt-get -qqy install \
   x11vnc \
-  && rm -rf /var/lib/apt/lists/*
-
-USER seluser
-
-RUN mkdir -p ~/.vnc \
- && x11vnc -storepasswd secret ~/.vnc/passwd
-
-USER root
+  && rm -rf /var/lib/apt/lists/* \
+  && mkdir -p /root/.vnc \
+  && x11vnc -storepasswd secret ~/.vnc/passwd
 
 #=================
 # Locale settings