docker
/
docker-ubuntu-vnc-desktop
mirror of https://github.com/fcwu/docker-ubuntu-vnc-desktop
1
0
Fork 0
Code Issues Releases Activity

feat: support x11vnc args - X11VNC_ARGS (bug #101) 

Docker env X11VNC_ARGS
This commit is contained in:
Doro Wu 2019-02-23 16:57:02 +08:00
parent e6441d418a
commit 0adc0da8e8
No known key found for this signature in database
GPG Key ID: 3F2E4F1C2D4A1AA4
3 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Dockerfile.amd64
View File

@ -17,7 +17,7 @@ RUN apt-get update \
supervisor nginx sudo vim-tiny net-tools zenity xz-utils \ supervisor nginx sudo vim-tiny net-tools zenity xz-utils \
dbus-x11 x11-utils alsa-utils \ dbus-x11 x11-utils alsa-utils \
mesa-utils libgl1-mesa-dri \ mesa-utils libgl1-mesa-dri \
lxde xvfb x11vnc \ lxde xvfb x11vnc=0.9.16 \
gtk2-engines-murrine gnome-themes-standard gtk2-engines-pixbuf gtk2-engines-murrine arc-theme \ gtk2-engines-murrine gnome-themes-standard gtk2-engines-pixbuf gtk2-engines-murrine arc-theme \
firefox chromium-browser \ firefox chromium-browser \
ttf-ubuntu-font-family ttf-wqy-zenhei \ ttf-ubuntu-font-family ttf-wqy-zenhei \

1
README.md
View File

@ -120,6 +120,7 @@ Troubleshooting and FAQ
1. boot2docker connection issue, https://github.com/fcwu/docker-ubuntu-vnc-desktop/issues/2 1. boot2docker connection issue, https://github.com/fcwu/docker-ubuntu-vnc-desktop/issues/2
2. Multi-language supports, https://github.com/fcwu/docker-ubuntu-vnc-desktop/issues/80 2. Multi-language supports, https://github.com/fcwu/docker-ubuntu-vnc-desktop/issues/80
3. Autostart, https://github.com/fcwu/docker-ubuntu-vnc-desktop/issues/85 3. Autostart, https://github.com/fcwu/docker-ubuntu-vnc-desktop/issues/85
4. x11vnc arguments(multiptr), https://github.com/fcwu/docker-ubuntu-vnc-desktop/issues/101
License License
================== ==================

4
image/startup.sh
View File

@ -8,6 +8,10 @@ if [ -n "$VNC_PASSWORD" ]; then
export VNC_PASSWORD= export VNC_PASSWORD=
fi fi
if [ -n "$X11VNC_ARGS" ]; then
sed -i "s/^command=x11vnc.*/& ${X11VNC_ARGS}/" /etc/supervisor/conf.d/supervisord.conf
fi
if [ -n "$RESOLUTION" ]; then if [ -n "$RESOLUTION" ]; then
sed -i "s/1024x768/$RESOLUTION/" /usr/local/bin/xvfb.sh sed -i "s/1024x768/$RESOLUTION/" /usr/local/bin/xvfb.sh
fi fi