xiaosong/vagex
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

modify

Browse Source
This commit is contained in:
岳松
2016-10-18 16:11:30 +08:00
parent a722ed0af5
commit d7db7119de
2 changed files with 24 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Dockerfile
View File

@@ -1,9 +1,10 @@
FROM ubuntu:14.04 FROM ubuntu
RUN apt-get update \ RUN apt-get update \
&& apt-get install -y wget firefox xfce4 vnc4server && apt-get install -y wget firefox xfce4 vnc4server
ENV DISPLAY=":1" VNC_COL_DEPTH=24 VNC_RESOLUTION=1280x800 VNC_PW=xiaosong 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 \ && mkdir flash_player \
&& tar zxvf install_flash_player_11_linux.x86_64.tar.gz -C flash_player \ && tar zxvf install_flash_player_11_linux.x86_64.tar.gz -C flash_player \
&& mkdir -p ~/.mozilla/plugins/ \ && 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 && rm -rf flash_player install_flash_player_11_linux.x86_64.tar.gz
EXPOSE 5901 EXPOSE 5901
COPY xstartup /root/.vnc/
COPY vnc.sh /opt/ COPY vnc.sh /opt/
CMD ["/opt/vnc.sh"] CMD ["/opt/vnc.sh"]

20
xstartup Normal file
View File

@@ -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