Backup_Repos/docker-ubuntu-vnc-desktop
1
0
Fork 0
mirror of https://github.com/fcwu/docker-ubuntu-vnc-desktop synced 2025-12-06 16:32:47 +01:00
Code Issues Projects Releases Wiki Activity

CHT supports and cleanup

Browse source
This commit is contained in:
Doro Wu 2015-05-12 19:04:20 +08:00
parent 602ac45102
commit 1bc6fcb092
3 changed files with 19 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
Dockerfile
View file

@ -4,11 +4,6 @@ MAINTAINER Doro Wu <fcwu.tw@gmail.com>
ENV DEBIAN_FRONTEND noninteractive ENV DEBIAN_FRONTEND noninteractive
ENV HOME /root ENV HOME /root
# no Upstart or DBus
# https://github.com/dotcloud/docker/issues/1724#issuecomment-26294856
RUN apt-mark hold initscripts udev plymouth mountall
RUN dpkg-divert --local --rename --add /sbin/initctl && ln -sf /bin/true /sbin/initctl
RUN apt-get update \ RUN apt-get update \
&& apt-get install -y --force-yes --no-install-recommends supervisor \ && apt-get install -y --force-yes --no-install-recommends supervisor \
openssh-server pwgen sudo vim-tiny \ openssh-server pwgen sudo vim-tiny \
@ -16,15 +11,16 @@ RUN apt-get update \
lxde x11vnc xvfb \ lxde x11vnc xvfb \
gtk2-engines-murrine ttf-ubuntu-font-family \ gtk2-engines-murrine ttf-ubuntu-font-family \
libreoffice firefox \ libreoffice firefox \
fonts-wqy-microhei \
language-pack-zh-hant language-pack-gnome-zh-hant firefox-locale-zh-hant libreoffice-l10n-zh-tw \
&& apt-get autoclean \ && apt-get autoclean \
&& apt-get autoremove \ && apt-get autoremove \
&& rm -rf /var/lib/apt/lists/* && rm -rf /var/lib/apt/lists/*
ADD noVNC /noVNC/ ADD noVNC /noVNC/
ADD startup.sh / ADD startup.sh /
ADD supervisord.conf / ADD supervisord.conf /etc/
EXPOSE 6080 EXPOSE 6080
EXPOSE 5900 WORKDIR /root
EXPOSE 22
WORKDIR /
ENTRYPOINT ["/startup.sh"] ENTRYPOINT ["/startup.sh"]

6
startup.sh
View file

@ -9,8 +9,4 @@ PASS=ubuntu
id -u ubuntu &>/dev/null || useradd --create-home --shell /bin/bash --user-group --groups adm,sudo ubuntu id -u ubuntu &>/dev/null || useradd --create-home --shell /bin/bash --user-group --groups adm,sudo ubuntu
echo "ubuntu:$PASS" | chpasswd echo "ubuntu:$PASS" | chpasswd
/usr/bin/supervisord -c /supervisord.conf /usr/bin/supervisord -c /etc/supervisord.conf -n
while [ 1 ]; do
/bin/bash
done

26
supervisord.conf
View file

@ -1,14 +1,12 @@
[supervisord] [supervisord]
nodaemon=true
logfile_maxbytes=10MB
pidfile=/var/run/supervisord.pid
logfile=/var/log/supervisord.log
nodaemon=false nodaemon=false
[program:ssh] [supervisorctl]
priority=10 serverurl=unix:///var/run/supervisor.sock
directory=/
command=/usr/sbin/sshd -D
user=root
autostart=true
autorestart=true
stopsignal=QUIT
[program:xvfb] [program:xvfb]
priority=10 priority=10
@ -19,7 +17,7 @@ autostart=true
autorestart=true autorestart=true
stopsignal=QUIT stopsignal=QUIT
stdout_logfile=/var/log/xvfb.log stdout_logfile=/var/log/xvfb.log
stderr_logfile=/var/log/xvfb.err redirect_stderr=true
[program:lxsession] [program:lxsession]
priority=15 priority=15
@ -31,19 +29,18 @@ autorestart=true
stopsignal=QUIT stopsignal=QUIT
environment=DISPLAY=":1",HOME="/home/ubuntu" environment=DISPLAY=":1",HOME="/home/ubuntu"
stdout_logfile=/var/log/lxsession.log stdout_logfile=/var/log/lxsession.log
stderr_logfile=/var/log/lxsession.err redirect_stderr=true
[program:x11vnc] [program:x11vnc]
priority=20 priority=20
directory=/ directory=/
command=x11vnc -display :1 -xkb command=/bin/dash -c "while :; do x11vnc -display :1 -xkb; done"
#command=x11vnc -display :1 -listen localhost -xkb
user=root user=root
autostart=true autostart=true
autorestart=true autorestart=true
stopsignal=QUIT stopsignal=QUIT
stdout_logfile=/var/log/x11vnc.log stdout_logfile=/var/log/x11vnc.log
stderr_logfile=/var/log/x11vnc.err redirect_stderr=true
[program:novnc] [program:novnc]
priority=25 priority=25
@ -54,4 +51,5 @@ autostart=true
autorestart=true autorestart=true
stopsignal=QUIT stopsignal=QUIT
stdout_logfile=/var/log/novnc.log stdout_logfile=/var/log/novnc.log
stderr_logfile=/var/log/novnc.err redirect_stderr=true
stopasgroup=true