Merge branch 'novnc_1.0' of git://github.com/hsiaoyi0504/docker-headl…

…ess-vnc-container into hsiaoyi0504-novnc_1.0

.travis.yml

@@ -0,0 +1,24 @@
+sudo: required
+
+services:
+  - docker
+
+language: generic
+
+env:
+- DISTRI=centos DESKTOP=Xfce4
+- DISTRI=centos DESKTOP=IceWM
+- DISTRI=ubuntu DESKTOP=Xfce4
+- DISTRI=ubuntu DESKTOP=IceWM
+
+script:
+  - 'if [ ${DISTRI} == "centos" ] && [ ${DESKTOP} == "Xfce4" ]; then
+      docker build -t centos-xfce-vnc -f ./Dockerfile.centos.xfce.vnc . ;
+    elif [ ${DISTRI} == "centos" ] && [ ${DESKTOP} == "IceWM" ]; then
+      docker build -t centos-icewm-vnc -f ./Dockerfile.centos.icewm.vnc . ;
+    elif [ ${DISTRI} == "ubuntu" ] && [ ${DESKTOP} == "Xfce4" ]; then
+      docker build -t ubuntu-xfce-vnc -f ./Dockerfile.ubuntu.xfce.vnc . ;
+    else
+      docker build -t ubuntu-icewm-vnc -f ./Dockerfile.ubuntu.icewm.vnc . ;
+    fi' 
+

src/common/install/no_vnc.sh

@@ -4,9 +4,9 @@ set -e
 
 echo "Install noVNC - HTML5 based VNC viewer"
 mkdir -p $NO_VNC_HOME/utils/websockify
-wget -qO- https://github.com/novnc/noVNC/archive/v0.6.2.tar.gz | tar xz --strip 1 -C $NO_VNC_HOME
+wget -qO- https://github.com/novnc/noVNC/archive/v1.0.0.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/v0.8.0.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_auto.html`
 ln -s $NO_VNC_HOME/vnc_auto.html $NO_VNC_HOME/index.html