diff --git a/Dockerfile.centos.icewm.vnc b/Dockerfile.centos.icewm.vnc index a0c651aa..4230b0d6 100755 --- a/Dockerfile.centos.icewm.vnc +++ b/Dockerfile.centos.icewm.vnc @@ -2,8 +2,8 @@ FROM centos:7 -MAINTAINER Simon Hofmann "simon.hofmann@consol.de" -ENV REFRESHED_AT 2018-10-29 +MAINTAINER Ken Wang "463407426@qq.com" +ENV REFRESHED_AT 2019-10-17 LABEL io.k8s.description="Headless VNC Container with IceWM window manager, firefox and chromium" \ io.k8s.display-name="Headless VNC Container based on Centos" \ diff --git a/Dockerfile.centos.xfce.vnc b/Dockerfile.centos.xfce.vnc index c19cc547..cf4fad56 100755 --- a/Dockerfile.centos.xfce.vnc +++ b/Dockerfile.centos.xfce.vnc @@ -2,8 +2,8 @@ FROM centos:7 -MAINTAINER Simon Hofmann "simon.hofmann@consol.de" -ENV REFRESHED_AT 2018-10-29 +MAINTAINER Ken Wang "463407426@qq.com" +ENV REFRESHED_AT 2019-10-17 LABEL io.k8s.description="Headless VNC Container with Xfce window manager, firefox and chromium" \ io.k8s.display-name="Headless VNC Container based on Centos" \ diff --git a/Dockerfile.ubuntu.icewm.vnc b/Dockerfile.ubuntu.icewm.vnc index e66e51b1..e3c144f7 100644 --- a/Dockerfile.ubuntu.icewm.vnc +++ b/Dockerfile.ubuntu.icewm.vnc @@ -1,9 +1,9 @@ # This Dockerfile is used to build an headles vnc image based on Ubuntu -FROM ubuntu:16.04 +FROM ubuntu:18.04 -MAINTAINER Simon Hofmann "simon.hofmann@consol.de" -ENV REFRESHED_AT 2018-10-29 +MAINTAINER Ken Wang "463407426@qq.com" +ENV REFRESHED_AT 2019-10-17 LABEL io.k8s.description="Headless VNC Container with IceWM window manager, firefox and chromium" \ io.k8s.display-name="Headless VNC Container based on Ubuntu" \ @@ -11,7 +11,12 @@ LABEL io.k8s.description="Headless VNC Container with IceWM window manager, fire io.openshift.tags="vnc, ubuntu, icewm" \ io.openshift.non-scalable=true -## Connection ports for controlling the UI: +### noVNC version +ARG noVNC_Version=v1.1.0 +ARG triggerVNC_Version=1.9.0 +ARG websockify_Version=v0.9.0 + +### Connection ports for controlling the UI: # VNC port:5901 # noVNC webport, connect via http://IP:6901/?password=vncpassword ENV DISPLAY=:1 \ diff --git a/Dockerfile.ubuntu.xfce.vnc b/Dockerfile.ubuntu.xfce.vnc index a8e95b0f..41a9d156 100644 --- a/Dockerfile.ubuntu.xfce.vnc +++ b/Dockerfile.ubuntu.xfce.vnc @@ -1,9 +1,9 @@ # This Dockerfile is used to build an headles vnc image based on Ubuntu -FROM ubuntu:16.04 +FROM ubuntu:18.04 -MAINTAINER Simon Hofmann "simon.hofmann@consol.de" -ENV REFRESHED_AT 2018-10-29 +MAINTAINER Ken Wang "463407426@qq.com" +ENV REFRESHED_AT 2019-10-17 LABEL io.k8s.description="Headless VNC Container with Xfce window manager, firefox and chromium" \ io.k8s.display-name="Headless VNC Container based on Ubuntu" \ @@ -11,7 +11,12 @@ LABEL io.k8s.description="Headless VNC Container with Xfce window manager, firef io.openshift.tags="vnc, ubuntu, xfce" \ io.openshift.non-scalable=true -## Connection ports for controlling the UI: +### noVNC version +ARG noVNC_Version=v1.1.0 +ARG triggerVNC_Version=1.9.0 +ARG websockify_Version=v0.9.0 + +### Connection ports for controlling the UI: # VNC port:5901 # noVNC webport, connect via http://IP:6901/?password=vncpassword ENV DISPLAY=:1 \ diff --git a/README.md b/README.md index 03c0309b..270f4e1c 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,17 @@ # Docker container images with "headless" VNC session +## Changes Done For This Fork +1. Ubuntu: Updated to 18.04 +2. noVNC: Updated to v1.1.0 +3. triggerVNC: Updated to 1.9.0 +4. websockify: Updated to 0.9.0 +5. To pull the image: + ``` + docker pull bugazelle/ubuntu-xfce-vnc + docker pull bugazelle/ubuntu-icewm-vnc + ``` + +## Original README.md This repository contains a collection of Docker images with headless VNC environments. Each Docker image is installed with the following components: diff --git a/src/common/install/no_vnc.sh b/src/common/install/no_vnc.sh index 13005865..91511dec 100644 --- a/src/common/install/no_vnc.sh +++ b/src/common/install/no_vnc.sh @@ -5,9 +5,9 @@ set -u echo "Install noVNC - HTML5 based VNC viewer" mkdir -p $NO_VNC_HOME/utils/websockify -wget -qO- https://github.com/novnc/noVNC/archive/v1.0.0.tar.gz | tar xz --strip 1 -C $NO_VNC_HOME +wget -qO- https://github.com/novnc/noVNC/archive/${noVNC_Version}.tar.gz | tar xz --strip 1 -C $NO_VNC_HOME # use older version of websockify to prevent hanging connections on offline containers, see https://github.com/ConSol/docker-headless-vnc-container/issues/50 -wget -qO- https://github.com/novnc/websockify/archive/v0.6.1.tar.gz | tar xz --strip 1 -C $NO_VNC_HOME/utils/websockify +wget -qO- https://github.com/novnc/websockify/archive/${websockify_Version}.tar.gz | tar xz --strip 1 -C $NO_VNC_HOME/utils/websockify chmod +x -v $NO_VNC_HOME/utils/*.sh ## create index.html to forward automatically to `vnc_lite.html` ln -s $NO_VNC_HOME/vnc_lite.html $NO_VNC_HOME/index.html \ No newline at end of file diff --git a/src/common/xfce/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml b/src/common/xfce/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml index 3cef7f45..181e2012 100644 --- a/src/common/xfce/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml +++ b/src/common/xfce/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml @@ -25,24 +25,24 @@ - + - + - + - + - + diff --git a/src/ubuntu/install/tigervnc.sh b/src/ubuntu/install/tigervnc.sh index c18e015f..00d41281 100644 --- a/src/ubuntu/install/tigervnc.sh +++ b/src/ubuntu/install/tigervnc.sh @@ -2,4 +2,4 @@ set -e echo "Install TigerVNC server" -wget -qO- https://dl.bintray.com/tigervnc/stable/tigervnc-1.8.0.x86_64.tar.gz | tar xz --strip 1 -C / +wget -qO- https://dl.bintray.com/tigervnc/stable/tigervnc-${triggerVNC_Version}.x86_64.tar.gz | tar xz --strip 1 -C /