wyrrrd/docker-wohnungsbot
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Merge pull request #5 from zerodivide1/master

Browse Source 
Fixed to allow reconnections
This commit is contained in:
Paim pozhil
2015-05-19 00:58:10 +05:30
parent 51803b555b 42bd78633f
commit a23ca0baec
3 changed files with 23 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Dockerfile
+14 -5
View File
@@ -1,10 +1,19 @@
FROM ubuntu:trusty FROM ubuntu:trusty
MAINTAINER paimpozhil@gmail.com MAINTAINER Sean Payne <seantpayne+docker@gmail.com>
RUN apt-get update -y
ENV DEBIAN_FRONTEND noninteractive ENV DEBIAN_FRONTEND noninteractive
RUN apt-get install -y git x11vnc wget python python-numpy unzip Xvfb firefox openbox geany
RUN cd /root && git clone https://github.com/kanaka/noVNC.git
ADD startup.sh /startup.sh 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 && \
cd noVNC/utils && git clone https://github.com/kanaka/websockify websockify && \
cd /root && \
chmod 0755 /startup.sh && \
apt-get autoclean && \
apt-get autoremove && \
rm -rf /var/lib/apt/lists/*
CMD /startup.sh CMD /startup.sh
EXPOSE 6080 EXPOSE 6080
README.md
+5 -10
View File
@@ -14,10 +14,10 @@ Especially useful if you have to give access to your friends who come over for f
## How to use ## 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 #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 cd docker-novnc
docker build -t novnc . docker build -t novnc .
docker run -td -p 6080:6080 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 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 ## Support
### http://dockerteam.com for all the docker based support. * http://docker.com for all the docker based support.
## Credits ## Credits
#### NoVNC http://kanaka.github.io/noVNC/ * [NoVNC](http://kanaka.github.io/noVNC/)
* [Original docker-novnc project](https://github.com/paimpozhil/docker-novnc)
startup.sh
+4 -3
View File
@@ -1,6 +1,7 @@
#!/bin/bash #!/bin/bash
export DISPLAY=:1 export DISPLAY=:1
Xvfb :1 -screen 0 1280x1024x16 & Xvfb :1 -screen 0 1600x900x16 &
sleep 5
openbox-session& 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 cd /root/noVNC && ln -s vnc_auto.html index.html && ./utils/launch.sh --vnc localhost:5900