diff --git a/Dockerfile b/Dockerfile index 10ba305..ff2c28a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,11 +1,9 @@ FROM ubuntu:14.04 RUN apt-get update \ - && apt-get install -y wget firefox lxde-core lxterminal tightvncserver -ENV VNCPWD=xiaosong -RUN && mkdir ~/.vnc \ - && echo $VNCPWD $VNCPWD | vncpasswd && \ - && wget http://fpdownload.macromedia.com/get/flashplayer/pdc/11.2.202.635/install_flash_player_11_linux.x86_64.tar.gz \ + && apt-get install -y wget firefox xfce4 vnc4server +ENV DISPLAY=":1" VNC_COL_DEPTH=24 VNC_RESOLUTION=1280x800 VNC_PW=xiaosong +RUN wget http://fpdownload.macromedia.com/get/flashplayer/pdc/11.2.202.635/install_flash_player_11_linux.x86_64.tar.gz \ && mkdir flash_player \ && tar zxvf install_flash_player_11_linux.x86_64.tar.gz -C flash_player \ && mkdir -p ~/.mozilla/plugins/ \ diff --git a/vnc.sh b/vnc.sh index 460b024..ff30315 100644 --- a/vnc.sh +++ b/vnc.sh @@ -1,6 +1,10 @@ #!/bin/bash -# Remove VNC lock (if process already killed) -rm /tmp/.X1-lock /tmp/.X11-unix/X1 -# Run VNC server with tail in the foreground -vncserver :1 -geometry 1280x800 -depth 24 && tail -F /root/.vnc/*.log \ No newline at end of file +##change vnc password +echo "change vnc password!" +(echo $VNC_PW && echo $VNC_PW) | vncpasswd + +##start vncserver +vncserver -kill :1 && rm -rfv /tmp/.X* ; echo "remove old vnc locks to be a reattachable container" +vncserver $DISPLAY -depth $VNC_COL_DEPTH -geometry $VNC_RESOLUTION +sleep 1 \ No newline at end of file