/etc/hosts hack no longer necessary since docker >= 1.2.0

Author: elgalu

Dockerfile

@@ -117,12 +117,13 @@ RUN chmod +x /opt/selenium/local-sel-headless.sh
 #===========
 # DNS stuff
 #===========
-# Poor man /etc/hosts updates until https://github.com/dotcloud/docker/issues/2267
-# Ref: https://stackoverflow.com/questions/19414543/how-can-i-make-etc-hosts-writable-by-root-in-a-docker-container
 ADD ./etc/hosts /tmp/hosts
-RUN mkdir -p -- /lib-override && cp /lib/x86_64-linux-gnu/libnss_files.so.2 /lib-override
-RUN perl -pi -e 's:/etc/hosts:/tmp/hosts:g' /lib-override/libnss_files.so.2
-ENV LD_LIBRARY_PATH /lib-override
+# Below hack is no longer necessary since docker >= 1.2.0, commented to ease old users transition
+#  Poor man /etc/hosts updates until https://github.com/dotcloud/docker/issues/2267
+#  Ref: https://stackoverflow.com/questions/19414543/how-can-i-make-etc-hosts-writable-by-root-in-a-docker-container
+#  RUN mkdir -p -- /lib-override && cp /lib/x86_64-linux-gnu/libnss_files.so.2 /lib-override
+#  RUN perl -pi -e 's:/etc/hosts:/tmp/hosts:g' /lib-override/libnss_files.so.2
+#  ENV LD_LIBRARY_PATH /lib-override
 
 #============================
 # Some configuration options

bin/entry_point.sh

@@ -2,9 +2,16 @@
 export GEOMETRY="$SCREEN_WIDTH""x""$SCREEN_HEIGHT""x""$SCREEN_DEPTH"
 export CONTAINER_IP=$(ip addr show dev eth0 | grep "inet " | awk '{print $2}' | cut -d '/' -f 1)
 export DOCKER_HOST_IP=$(netstat -nr | grep '^0\.0\.0\.0' | awk '{print $2}')
+export VNC_PORT=5900
 export XVFB_LOG="/tmp/Xvfb_headless.log"
 export FLUXBOX_LOG="/tmp/fluxbox_manager.log"
-export X11VNC_LOG="/tmp/x11vnc_forever.log"
+export VNC_LOG="/tmp/x11vnc_forever.log"
+export XTERMINAL_LOG="/tmp/local-sel-headless.log"
+
+# As of docker >= 1.2.0 is possible to append our stuff directly into /etc/hosts
+cat /tmp/hosts >> /etc/hosts
+echo "docker.host.dev   $DOCKER_HOST_IP" >> /etc/hosts
+echo "docker.guest.dev  $CONTAINER_IP"   >> /etc/hosts
 
 # Start the X server that can run on machines with no display 
 # hardware and no physical input devices
@@ -20,7 +27,7 @@ sleep 0.5
 
 # Start a GUI xTerm to easily debug the headless instance
 x-terminal-emulator -geometry 100x30+10+10 -ls -title "local-sel-headless" \
-    -e "/opt/selenium/local-sel-headless.sh" &
+    -e "/opt/selenium/local-sel-headless.sh" 2>&1 | tee $XTERMINAL_LOG  &
 
 # Start VNC server to enable viewing what's going on but not mandatory
-x11vnc -forever -usepw -display $DISPLAY >$X11VNC_LOG 2>&1
+x11vnc -forever -usepw -shared -rfbport $VNC_PORT -display $DISPLAY >$VNC_LOG 2>&1

bin/local-sel-headless.sh

@@ -1,6 +1,5 @@
 #!/usr/bin/env bash
 
 sudo -E -i -u user1 \
-    LD_LIBRARY_PATH=$LD_LIBRARY_PATH \
     DOCKER_HOST_IP=$DOCKER_HOST_IP \
     java -jar /opt/selenium/selenium-server-standalone.jar -port $SELENIUM_PORT