Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update to novnc 1.0 and introduce travis CI #66

Merged
merged 2 commits into from
Apr 3, 2018
Merged

Update to novnc 1.0 and introduce travis CI #66

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
50fb4e8
add travis
hsiaoyi0504 Feb 24, 2018
b16388c
update novnc version
hsiaoyi0504 Feb 24, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 24 additions & 0 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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'

4 changes: 2 additions & 2 deletions src/common/install/no_vnc.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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