Skip to content

Commit 70c14bb

Browse files
BugazelleBugazelle
committed
[Feat] Support Ubuntu 18.04 & noVNC updated to 1.1.0
1 parent 095d9bb commit 70c14bb

8 files changed

Lines changed: 42 additions & 20 deletions

File tree

‎Dockerfile.centos.icewm.vnc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
FROM centos:7
44

5-
MAINTAINER Simon Hofmann "simon.hofmann@consol.de"
6-
ENV REFRESHED_AT 2018-10-29
5+
MAINTAINER Ken Wang "463407426@qq.com"
6+
ENV REFRESHED_AT 2019-10-17
77

88
LABEL io.k8s.description="Headless VNC Container with IceWM window manager, firefox and chromium" \
99
io.k8s.display-name="Headless VNC Container based on Centos" \

‎Dockerfile.centos.xfce.vnc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
FROM centos:7
44

5-
MAINTAINER Simon Hofmann "simon.hofmann@consol.de"
6-
ENV REFRESHED_AT 2018-10-29
5+
MAINTAINER Ken Wang "463407426@qq.com"
6+
ENV REFRESHED_AT 2019-10-17
77

88
LABEL io.k8s.description="Headless VNC Container with Xfce window manager, firefox and chromium" \
99
io.k8s.display-name="Headless VNC Container based on Centos" \

‎Dockerfile.ubuntu.icewm.vnc‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,22 @@
11
# This Dockerfile is used to build an headles vnc image based on Ubuntu
22

3-
FROM ubuntu:16.04
3+
FROM ubuntu:18.04
44

5-
MAINTAINER Simon Hofmann "simon.hofmann@consol.de"
6-
ENV REFRESHED_AT 2018-10-29
5+
MAINTAINER Ken Wang "463407426@qq.com"
6+
ENV REFRESHED_AT 2019-10-17
77

88
LABEL io.k8s.description="Headless VNC Container with IceWM window manager, firefox and chromium" \
99
io.k8s.display-name="Headless VNC Container based on Ubuntu" \
1010
io.openshift.expose-services="6901:http,5901:xvnc" \
1111
io.openshift.tags="vnc, ubuntu, icewm" \
1212
io.openshift.non-scalable=true
1313

14-
## Connection ports for controlling the UI:
14+
### noVNC version
15+
ARG noVNC_Version=v1.1.0
16+
ARG triggerVNC_Version=1.9.0
17+
ARG websockify_Version=v0.9.0
18+
19+
### Connection ports for controlling the UI:
1520
# VNC port:5901
1621
# noVNC webport, connect via http://IP:6901/?password=vncpassword
1722
ENV DISPLAY=:1 \

‎Dockerfile.ubuntu.xfce.vnc‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,22 @@
11
# This Dockerfile is used to build an headles vnc image based on Ubuntu
22

3-
FROM ubuntu:16.04
3+
FROM ubuntu:18.04
44

5-
MAINTAINER Simon Hofmann "simon.hofmann@consol.de"
6-
ENV REFRESHED_AT 2018-10-29
5+
MAINTAINER Ken Wang "463407426@qq.com"
6+
ENV REFRESHED_AT 2019-10-17
77

88
LABEL io.k8s.description="Headless VNC Container with Xfce window manager, firefox and chromium" \
99
io.k8s.display-name="Headless VNC Container based on Ubuntu" \
1010
io.openshift.expose-services="6901:http,5901:xvnc" \
1111
io.openshift.tags="vnc, ubuntu, xfce" \
1212
io.openshift.non-scalable=true
1313

14-
## Connection ports for controlling the UI:
14+
### noVNC version
15+
ARG noVNC_Version=v1.1.0
16+
ARG triggerVNC_Version=1.9.0
17+
ARG websockify_Version=v0.9.0
18+
19+
### Connection ports for controlling the UI:
1520
# VNC port:5901
1621
# noVNC webport, connect via http://IP:6901/?password=vncpassword
1722
ENV DISPLAY=:1 \

‎README.md‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,17 @@
11
# Docker container images with "headless" VNC session
22

3+
## Changes Done For This Fork
4+
1. Ubuntu: Updated to 18.04
5+
2. noVNC: Updated to v1.1.0
6+
3. triggerVNC: Updated to 1.9.0
7+
4. websockify: Updated to 0.9.0
8+
5. To pull the image:
9+
```
10+
docker pull bugazelle/ubuntu-xfce-vnc
11+
docker pull bugazelle/ubuntu-icewm-vnc
12+
```
13+
14+
## Original README.md
315
This repository contains a collection of Docker images with headless VNC environments.
416

517
Each Docker image is installed with the following components:

‎src/common/install/no_vnc.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ set -u
55

66
echo "Install noVNC - HTML5 based VNC viewer"
77
mkdir -p $NO_VNC_HOME/utils/websockify
8-
wget -qO- https://github.com/novnc/noVNC/archive/v1.0.0.tar.gz | tar xz --strip 1 -C $NO_VNC_HOME
8+
wget -qO- https://github.com/novnc/noVNC/archive/${noVNC_Version}.tar.gz | tar xz --strip 1 -C $NO_VNC_HOME
99
# use older version of websockify to prevent hanging connections on offline containers, see https://github.com/ConSol/docker-headless-vnc-container/issues/50
10-
wget -qO- https://github.com/novnc/websockify/archive/v0.6.1.tar.gz | tar xz --strip 1 -C $NO_VNC_HOME/utils/websockify
10+
wget -qO- https://github.com/novnc/websockify/archive/${websockify_Version}.tar.gz | tar xz --strip 1 -C $NO_VNC_HOME/utils/websockify
1111
chmod +x -v $NO_VNC_HOME/utils/*.sh
1212
## create index.html to forward automatically to `vnc_lite.html`
1313
ln -s $NO_VNC_HOME/vnc_lite.html $NO_VNC_HOME/index.html

‎src/common/xfce/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,24 +25,24 @@
2525
<property name="workspace0" type="empty">
2626
<property name="color-style" type="int" value="0"/>
2727
<property name="image-style" type="int" value="4"/>
28-
<property name="last-image" type="string" value="/headless/.config/bg_sakuli.png"/>
28+
<!-- <property name="last-image" type="string" value="/headless/.config/bg_sakuli.png"/> -->
2929
</property>
3030
<property name="workspace1" type="empty">
3131
<property name="color-style" type="int" value="0"/>
3232
<property name="image-style" type="int" value="4"/>
33-
<property name="last-image" type="string" value="/headless/.config/bg_sakuli.png"/>
33+
<!-- <property name="last-image" type="string" value="/headless/.config/bg_sakuli.png"/> -->
3434
</property>
3535
<property name="workspace2" type="empty">
3636
<property name="color-style" type="int" value="0"/>
3737
<property name="image-style" type="int" value="4"/>
38-
<property name="last-image" type="string" value="/headless/.config/bg_sakuli.png"/>
38+
<!-- <property name="last-image" type="string" value="/headless/.config/bg_sakuli.png"/> -->
3939
</property>
4040
<property name="workspace3" type="empty">
4141
<property name="color-style" type="int" value="0"/>
4242
<property name="image-style" type="int" value="4"/>
43-
<property name="last-image" type="string" value="/headless/.config/bg_sakuli.png"/>
43+
<!-- <property name="last-image" type="string" value="/headless/.config/bg_sakuli.png"/> -->
4444
</property>
45-
<property name="image-path" type="string" value="/headless/.config/bg_sakuli.png"/>
45+
<!-- <property name="image-path" type="string" value="/headless/.config/bg_sakuli.png"/> -->
4646
<property name="image-show" type="bool" value="true"/>
4747
<property name="image-style" type="int" value="0"/>
4848
</property>

‎src/ubuntu/install/tigervnc.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22
set -e
33

44
echo "Install TigerVNC server"
5-
wget -qO- https://dl.bintray.com/tigervnc/stable/tigervnc-1.8.0.x86_64.tar.gz | tar xz --strip 1 -C /
5+
wget -qO- https://dl.bintray.com/tigervnc/stable/tigervnc-${triggerVNC_Version}.x86_64.tar.gz | tar xz --strip 1 -C /

0 commit comments

Comments
 (0)