Skip to content

Commit

Permalink
[Feat] Support Ubuntu 18.04 & noVNC updated to 1.1.0
Browse files Browse the repository at this point in the history
  • Loading branch information
Bugazelle committed Oct 20, 2019
1 parent 095d9bb commit 70c14bb
Show file tree
Hide file tree
Showing 8 changed files with 42 additions and 20 deletions.
4 changes: 2 additions & 2 deletions Dockerfile.centos.icewm.vnc
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

FROM centos:7

MAINTAINER Simon Hofmann "[email protected]"
ENV REFRESHED_AT 2018-10-29
MAINTAINER Ken Wang "[email protected]"
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" \
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile.centos.xfce.vnc
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

FROM centos:7

MAINTAINER Simon Hofmann "[email protected]"
ENV REFRESHED_AT 2018-10-29
MAINTAINER Ken Wang "[email protected]"
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" \
Expand Down
13 changes: 9 additions & 4 deletions Dockerfile.ubuntu.icewm.vnc
Original file line number Diff line number Diff line change
@@ -1,17 +1,22 @@
# This Dockerfile is used to build an headles vnc image based on Ubuntu

FROM ubuntu:16.04
FROM ubuntu:18.04

MAINTAINER Simon Hofmann "[email protected]"
ENV REFRESHED_AT 2018-10-29
MAINTAINER Ken Wang "[email protected]"
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" \
io.openshift.expose-services="6901:http,5901:xvnc" \
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 \
Expand Down
13 changes: 9 additions & 4 deletions Dockerfile.ubuntu.xfce.vnc
Original file line number Diff line number Diff line change
@@ -1,17 +1,22 @@
# This Dockerfile is used to build an headles vnc image based on Ubuntu

FROM ubuntu:16.04
FROM ubuntu:18.04

MAINTAINER Simon Hofmann "[email protected]"
ENV REFRESHED_AT 2018-10-29
MAINTAINER Ken Wang "[email protected]"
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" \
io.openshift.expose-services="6901:http,5901:xvnc" \
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 \
Expand Down
12 changes: 12 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
4 changes: 2 additions & 2 deletions src/common/install/no_vnc.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Original file line number Diff line number Diff line change
Expand Up @@ -25,24 +25,24 @@
<property name="workspace0" type="empty">
<property name="color-style" type="int" value="0"/>
<property name="image-style" type="int" value="4"/>
<property name="last-image" type="string" value="/headless/.config/bg_sakuli.png"/>
<!-- <property name="last-image" type="string" value="/headless/.config/bg_sakuli.png"/> -->
</property>
<property name="workspace1" type="empty">
<property name="color-style" type="int" value="0"/>
<property name="image-style" type="int" value="4"/>
<property name="last-image" type="string" value="/headless/.config/bg_sakuli.png"/>
<!-- <property name="last-image" type="string" value="/headless/.config/bg_sakuli.png"/> -->
</property>
<property name="workspace2" type="empty">
<property name="color-style" type="int" value="0"/>
<property name="image-style" type="int" value="4"/>
<property name="last-image" type="string" value="/headless/.config/bg_sakuli.png"/>
<!-- <property name="last-image" type="string" value="/headless/.config/bg_sakuli.png"/> -->
</property>
<property name="workspace3" type="empty">
<property name="color-style" type="int" value="0"/>
<property name="image-style" type="int" value="4"/>
<property name="last-image" type="string" value="/headless/.config/bg_sakuli.png"/>
<!-- <property name="last-image" type="string" value="/headless/.config/bg_sakuli.png"/> -->
</property>
<property name="image-path" type="string" value="/headless/.config/bg_sakuli.png"/>
<!-- <property name="image-path" type="string" value="/headless/.config/bg_sakuli.png"/> -->
<property name="image-show" type="bool" value="true"/>
<property name="image-style" type="int" value="0"/>
</property>
Expand Down
2 changes: 1 addition & 1 deletion src/ubuntu/install/tigervnc.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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 /

0 comments on commit 70c14bb

Please sign in to comment.