From 4a0707ad01bdf3eb0f8367467ef04b84604aaed8 Mon Sep 17 00:00:00 2001 From: Sean Payne Date: Sun, 17 May 2015 01:12:13 -0700 Subject: [PATCH 1/9] Added dependency on menu --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index eb10b06..06424b2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM ubuntu:trusty MAINTAINER paimpozhil@gmail.com RUN apt-get update -y ENV DEBIAN_FRONTEND noninteractive -RUN apt-get install -y git x11vnc wget python python-numpy unzip Xvfb firefox openbox geany +RUN apt-get install -y git x11vnc wget python python-numpy unzip Xvfb firefox openbox geany menu RUN cd /root && git clone https://github.com/kanaka/noVNC.git ADD startup.sh /startup.sh RUN chmod 0755 /startup.sh From 775fdbdf1484121b216056b2b1b5b99948dcfdbd Mon Sep 17 00:00:00 2001 From: Sean Payne Date: Sun, 17 May 2015 01:14:30 -0700 Subject: [PATCH 2/9] Changed virtual screen dimensions --- startup.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/startup.sh b/startup.sh index d9efcef..82b6a4e 100644 --- a/startup.sh +++ b/startup.sh @@ -1,6 +1,6 @@ #!/bin/bash export DISPLAY=:1 -Xvfb :1 -screen 0 1280x1024x16 & +Xvfb :1 -screen 0 1600x900x16 & openbox-session& x11vnc -display :1 -bg -nopw -listen localhost -xkb -ncache 10 -ncache_cr cd /root/noVNC && ./utils/launch.sh --vnc localhost:5900 From 05a3fdeabc56f00b586f8c1d64b3476f7c04accc Mon Sep 17 00:00:00 2001 From: Sean Payne Date: Sun, 17 May 2015 01:15:04 -0700 Subject: [PATCH 3/9] Added short delay to ensure Xvfb created framebuffer --- startup.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/startup.sh b/startup.sh index 82b6a4e..226d6f0 100644 --- a/startup.sh +++ b/startup.sh @@ -1,6 +1,7 @@ #!/bin/bash export DISPLAY=:1 Xvfb :1 -screen 0 1600x900x16 & +sleep 5 openbox-session& x11vnc -display :1 -bg -nopw -listen localhost -xkb -ncache 10 -ncache_cr cd /root/noVNC && ./utils/launch.sh --vnc localhost:5900 From 4a0cbfba00f4dd015db22aa590cfe04285713005 Mon Sep 17 00:00:00 2001 From: Sean Payne Date: Sun, 17 May 2015 01:15:44 -0700 Subject: [PATCH 4/9] Changed x11vnc options to allow reconnections --- startup.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/startup.sh b/startup.sh index 226d6f0..d00532a 100644 --- a/startup.sh +++ b/startup.sh @@ -3,5 +3,5 @@ export DISPLAY=:1 Xvfb :1 -screen 0 1600x900x16 & sleep 5 openbox-session& -x11vnc -display :1 -bg -nopw -listen localhost -xkb -ncache 10 -ncache_cr +x11vnc -display :1 -nopw -listen localhost -xkb -ncache 10 -ncache_cr -forever & cd /root/noVNC && ./utils/launch.sh --vnc localhost:5900 From 4ac2f49cdc441c4605ec87ac97253e16fcd94f05 Mon Sep 17 00:00:00 2001 From: Sean Payne Date: Sun, 17 May 2015 01:30:29 -0700 Subject: [PATCH 5/9] Re-arranged Dockerfile to reduce container size --- Dockerfile | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 06424b2..bb446e2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,10 +1,17 @@ FROM ubuntu:trusty MAINTAINER paimpozhil@gmail.com -RUN apt-get update -y + ENV DEBIAN_FRONTEND noninteractive -RUN apt-get install -y git x11vnc wget python python-numpy unzip Xvfb firefox openbox geany menu -RUN cd /root && git clone https://github.com/kanaka/noVNC.git + ADD startup.sh /startup.sh -RUN chmod 0755 /startup.sh + +RUN apt-get update -y && \ + apt-get install -y git x11vnc wget python python-numpy unzip Xvfb firefox openbox geany menu && \ + cd /root && git clone https://github.com/kanaka/noVNC.git && \ + chmod 0755 /startup.sh && \ + apt-get autoclean && \ + apt-get autoremove && \ + rm -rf /var/lib/apt/lists/* + CMD /startup.sh EXPOSE 6080 From 9a0c7ea4c15138ca4f3816fec126b9cb611a63bd Mon Sep 17 00:00:00 2001 From: Sean Payne Date: Sun, 17 May 2015 01:49:06 -0700 Subject: [PATCH 6/9] Added dependency on websockify. Eliminates the re-download of websockify on each launch of the container. --- Dockerfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Dockerfile b/Dockerfile index bb446e2..7f72df4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,6 +8,8 @@ ADD startup.sh /startup.sh RUN apt-get update -y && \ apt-get install -y git x11vnc wget python python-numpy unzip Xvfb firefox openbox geany menu && \ cd /root && git clone https://github.com/kanaka/noVNC.git && \ + cd noVNC/utils && git clone https://github.com/kanaka/websockify websockify && \ + cd /root && \ chmod 0755 /startup.sh && \ apt-get autoclean && \ apt-get autoremove && \ From 8bccad38f11f39c1c666caab403f7894d919341c Mon Sep 17 00:00:00 2001 From: Sean Payne Date: Sun, 17 May 2015 01:49:52 -0700 Subject: [PATCH 7/9] Changed index to automatically connect to the novnc instance. --- startup.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/startup.sh b/startup.sh index d00532a..05e4ea4 100644 --- a/startup.sh +++ b/startup.sh @@ -4,4 +4,4 @@ Xvfb :1 -screen 0 1600x900x16 & sleep 5 openbox-session& x11vnc -display :1 -nopw -listen localhost -xkb -ncache 10 -ncache_cr -forever & -cd /root/noVNC && ./utils/launch.sh --vnc localhost:5900 +cd /root/noVNC && ln -s vnc_auto.html index.html && ./utils/launch.sh --vnc localhost:5900 From caf567368b5fb7e61fe091c4b91150791321489f Mon Sep 17 00:00:00 2001 From: Sean Payne Date: Mon, 18 May 2015 10:43:52 -0700 Subject: [PATCH 8/9] Updated maintainer of this fork --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 7f72df4..58a6868 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ FROM ubuntu:trusty -MAINTAINER paimpozhil@gmail.com +MAINTAINER Sean Payne ENV DEBIAN_FRONTEND noninteractive From 42bd78633f61d49840c6ccac8c08ee54345eaa2a Mon Sep 17 00:00:00 2001 From: Sean Payne Date: Mon, 18 May 2015 10:44:06 -0700 Subject: [PATCH 9/9] Updated README --- README.md | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index ae89975..f0031a8 100644 --- a/README.md +++ b/README.md @@ -14,10 +14,10 @@ Especially useful if you have to give access to your friends who come over for f ## How to use ``` -docker run -td -p 6080:6080 paimpozhil/docker-novnc +docker run -td -p 6080:6080 zerodivide1/docker-novnc #Or if you like to build yourself -git clone https://github.com/paimpozhil/docker-novnc.git +git clone https://github.com/zerodivide1/docker-novnc.git cd docker-novnc docker build -t novnc . docker run -td -p 6080:6080 novnc @@ -43,17 +43,12 @@ apt-get commands ex: apt-get install libreoffice-base libreoffice-gtk libreoffice-calc -## To DO - -Setup a LXDE version for a more desktop like setup - -Add Authentication for VNC. - ## Support -### http://dockerteam.com for all the docker based support. +* http://docker.com for all the docker based support. ## Credits -#### NoVNC http://kanaka.github.io/noVNC/ +* [NoVNC](http://kanaka.github.io/noVNC/) +* [Original docker-novnc project](https://github.com/paimpozhil/docker-novnc)