diff --git a/Dockerfile b/Dockerfile index ff2c28a..cf4d4e6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,9 +1,10 @@ -FROM ubuntu:14.04 +FROM ubuntu RUN apt-get update \ && 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 \ +RUN mkdir /root/.vnc/ \ + && 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/ \ @@ -11,5 +12,6 @@ RUN wget http://fpdownload.macromedia.com/get/flashplayer/pdc/11.2.202.635/insta && rm -rf flash_player install_flash_player_11_linux.x86_64.tar.gz EXPOSE 5901 +COPY xstartup /root/.vnc/ COPY vnc.sh /opt/ CMD ["/opt/vnc.sh"] \ No newline at end of file diff --git a/xstartup b/xstartup new file mode 100644 index 0000000..819248a --- /dev/null +++ b/xstartup @@ -0,0 +1,20 @@ +#!/bin/sh + +unset SESSION_MANAGER +#unset DBUS_SESSION_BUS_ADDRESS + +#startxfce4 & +#export XKL_XMODMAP_DISABLE=1 + + +[ -x /etc/vnc/xstartup ] && exec /etc/vnc/xstartup +[ -r $HOME/.Xresources ] && xrdb $HOME/.Xresources +xsetroot -solid grey +vncconfig -iconic & + +exec /etc/X11/xinit/xinitrc +#/etc/xdg/xfce4/xinitrc + +x-terminal-emulator -geometry 80x24+10+10 -ls -title "$VNCDESKTOP Desktop" & +#exec /usr/bin/xfce4-session & +exec /etc/X11/xinit/xinitrc \ No newline at end of file