diff --git a/Dockerfile b/Dockerfile index d91f995..70713ef 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,7 +8,7 @@ ENV LC_ALL en_US.UTF-8 ENV XYZ 1024x768x16 ENV TZ "Asia/Shanghai" -ENV VNC_PW "vncpassword" +ENV VNC_PW "484" ENV DISPLAY :0 @@ -29,7 +29,7 @@ RUN apt-get -qqy --no-install-recommends install \ ttf-wqy-microhei #升级系统,安装必要的包,配置VNC密码 -RUN apt-get -y install xvfb x11vnc fluxbox xdotool git git-core ca-certificates && \ +RUN apt-get -y install xvfb x11vnc openbox xdotool git git-core ca-certificates && \ mkdir ~/.vnc && \ touch ~/.vnc/passwd RUN x11vnc -storepasswd $VNC_PW ~/.vnc/passwd @@ -38,6 +38,7 @@ RUN apt-get -y install xvfb x11vnc fluxbox xdotool git git-core ca-certificates RUN git clone --recursive https://github.com/novnc/noVNC.git /opt/novnc && \ git clone --recursive https://github.com/novnc/websockify.git /opt/novnc/utils/websockify && \ ln -s /opt/novnc/vnc.html /opt/novnc/index.html +RUN git clone --recursive https://git.n0r.su/n0rdye/novnc /opt/noweb #安装firefox RUN echo "deb http://archive.canonical.com/ubuntu/ xenial partner" >> /etc/apt/sources.list && \ diff --git a/docker-compose.yml b/docker-compose.yml new file mode 100644 index 0000000..c6f3ca6 --- /dev/null +++ b/docker-compose.yml @@ -0,0 +1,5 @@ +services: + firevnc: + build: . + ports: + - 8787:8787 diff --git a/supervisord.conf b/supervisord.conf index a103ff6..0a12f0a 100644 --- a/supervisord.conf +++ b/supervisord.conf @@ -24,10 +24,10 @@ stdout_logfile=/var/log/x11vnc.log redirect_stderr=true -[program:fluxbox] +[program:openbox] priority=20 directory=/ -command=/usr/bin/startfluxbox +command=/usr/bin/openbox user=root autostart=true autorestart=true @@ -39,7 +39,7 @@ stopasgroup=true [program:novnc] priority=25 directory=/opt/novnc -command=/opt/novnc/utils/launch.sh --vnc localhost:5900 --listen 8787 --web /opt/novnc +command=/opt/novnc/utils/novnc_proxy --vnc localhost:5900 --listen 8787 --web /opt/noweb/src user=root autostart=true autorestart=true @@ -48,11 +48,24 @@ stdout_logfile=/var/log/novnc.log redirect_stderr=true stopasgroup=true -[program:myrun] -priority=27 -command=/usr/bin/myrun -autorestart=false -stdout_logfile=/var/log/myrun.log +[program:novnc] +priority=26 +directory=/opt/novnc +command=/opt/novnc/utils/novnc_proxy --vnc localhost:5900 --listen 8788 --web /opt/novnc +user=root +autostart=true +autorestart=true +stopsignal=QUIT +stdout_logfile=/var/log/novnc.log +redirect_stderr=true +stopasgroup=true + + +#[program:myrun] +#priority=27 +#command=/usr/bin/myrun +#autorestart=false +#stdout_logfile=/var/log/myrun.log [program:firefox]