Commit b6f23b5e authored by Stefano Alberto Russo's avatar Stefano Alberto Russo
Browse files

Addedd support for novnc port.

parent aa23e734

containers/MetaDesktop/Dockerfile

+3 −2
Original line number Diff line number Diff line
@@ -56,8 +56,9 @@ RUN cd /opt && wget https://bintray.com/tigervnc/stable/download_file?file_path= 
# Supervisord configuration

COPY files/supervisord_vnc.conf /etc/supervisor/conf.d/

COPY files/run_vnc.sh /etc/supervisor/conf.d/

COPY files/run_novnc.sh /etc/supervisor/conf.d/

RUN chmod 755 /etc/supervisor/conf.d/run_vnc.sh



RUN chmod 755 /etc/supervisor/conf.d/run_novnc.sh



# Web VNC (noVNC) v0.6.1.

# NOTE: this is a custom version from Doro Wu (fcwu.tw@gmail.com).
@@ -69,7 +70,7 @@ COPY files/index.html /usr/lib/noVNC 
RUN apt-get install -y net-tools



# Supervisord configuration

COPY files/supervisord_webvnc.conf /etc/supervisor/conf.d/

COPY files/supervisord_novnc.conf /etc/supervisor/conf.d/



# X environment setup/startup

RUN apt-get install fluxbox -y

containers/MetaDesktop/files/run_novnc.sh

0 → 100755
+12 −0
Original line number Diff line number Diff line 
#!/bin/bash



# Exec TigerVNC server 



if [ "x$TASK_PORT" == "x" ]; then

    /usr/lib/noVNC/utils/launch.sh --listen 8590

    echo "Running noVN on port 8590"

else

    /usr/lib/noVNC/utils/launch.sh --listen $TASK_PORT

    echo "Running noVN on port $TASK_PORT"



fi

containers/MetaDesktop/files/supervisord_novnc.conf

0 → 100644
+23 −0
Original line number Diff line number Diff line 
;=======================================

; noVNC service

;=======================================

 

[program:novnc]

 

; General

directory     = /usr/lib/noVNC/

command       = /etc/supervisor/conf.d/run_novnc.sh

numprocs      = 1

autostart     = true

autorestart   = true

startsecs     = 10

stopwaitsecs  = 30

process_name  = novnc

 

; Standard out / error

stdout_logfile          = /metauser/logs/%(program_name)s.log

stdout_logfile_maxbytes = 5MB

stdout_logfile_backups  = 10

stderr_logfile          = /metauser/logs/%(program_name)s.log

stderr_logfile_maxbytes = 5MB

stderr_logfile_backups  = 10