new version

This commit is contained in:
岳松
2016-10-16 08:48:40 +08:00
parent d8eb959de8
commit 803767188c
2 changed files with 20 additions and 24 deletions

View File

@@ -1,15 +1,21 @@
FROM centos:6
MAINTAINER xiaosong
RUN yum update -y \
&& yum -y install wget tigervnc-server epel-release firefox \
&& yum -y groupinstall xfce
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/ \
&& cp flash_player/libflashplayer.so ~/.mozilla/plugins/ \
&& rm -rf flash_player install_flash_player_11_linux.x86_64.tar.gz /tmp/.X11-unix/*
ADD ./conf/xstartup /root/.vnc/xstartup
RUN echo "xiaosong" | /usr/bin/vncpasswd -f > /root/.vnc/passwd
# Firefox over VNC
#
# VERSION 0.3
FROM ubuntu
# Install vnc, xvfb in order to create a 'fake' display and firefox
RUN apt-get update \
&& apt-get install -y x11vnc xvfb firefox \
&& mkdir ~/.vnc \
&& x11vnc -storepasswd xiaosong ~/.vnc/passwd \
&& bash -c 'echo "firefox" >> /.bashrc' \
&& 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/ \
&& cp flash_player/libflashplayer.so ~/.mozilla/plugins/ \
&& rm -rf flash_player install_flash_player_11_linux.x86_64.tar.gz
EXPOSE 5901
CMD ["/bin/bash"]
CMD ["x11vnc", "-forever", "-usepw", "-create"]

View File

@@ -1,10 +0,0 @@
#!/bin/sh
# Uncomment the following two lines for normal desktop:
unset SESSION_MANAGER
#exec /etc/X11/xinit/xinitrc
[ -x /etc/vnc/xstartup ] && exec /etc/vnc/xstartup
[ -r $HOME/.Xresources ] && xrdb $HOME/.Xresources
xsetroot -solid grey
#xterm -geometry 80x24+10+10 -ls -title "$VNCDESKTOP Desktop" &
#twm &
startxfce4 &