Explorar o código

Use the novnc package rather than git

Andrew Phillips %!s(int64=7) %!d(string=hai) anos
pai
achega
1de4840359
Modificáronse 2 ficheiros con 4 adicións e 13 borrados
  1. 2 11
      Dockerfile
  2. 2 2
      supervisord.conf

+ 2 - 11
Dockerfile

@@ -17,23 +17,14 @@ RUN set -ex; \
       bash \
       fluxbox \
       git \
+      net-tools \
+      novnc \
       socat \
       supervisor \
       x11vnc \
       xterm \
       xvfb
 
-# Clone noVNC from github
-RUN set -ex; \
-    git clone https://github.com/kanaka/noVNC.git /root/noVNC; \
-    git clone https://github.com/kanaka/websockify /root/noVNC/utils/websockify; \
-    rm -rf /root/noVNC/.git; \
-    rm -rf /root/noVNC/utils/websockify/.git; \
-    apt-get remove -y --purge git
-
-# Modify the launch script 'ps -p'
-RUN sed -i -- "s/ps -p/ps -o pid | grep/g" /root/noVNC/utils/launch.sh
-
 COPY . /app
 
 CMD ["/usr/bin/supervisord", "-c", "/app/supervisord.conf"]

+ 2 - 2
supervisord.conf

@@ -6,11 +6,11 @@ command=Xvfb :0 -screen 0 "%(ENV_DISPLAY_WIDTH)s"x"%(ENV_DISPLAY_HEIGHT)s"x24
 autorestart=true
 
 [program:x11vnc]
-command=/usr/bin/x11vnc
+command=x11vnc -forever
 autorestart=true
 
 [program:novnc]
-command=/root/noVNC/utils/launch.sh --vnc localhost:5900 --listen 8080
+command=websockify --web /usr/share/novnc 8080 localhost:5900
 autorestart=true
 
 [program:socat]