Commit 11e93ae5 authored by Stefano Alberto Russo's avatar Stefano Alberto Russo
Browse files

Merge branch 'feature/KasmVNC' into develop

parents 919a4568 49a6fef3

BasicMetaDesktop/run.sh

+1 −1
Original line number Original line Diff line number Diff line 
#!/bin/bash

#!/bin/bash

docker run -v$PWD/:/data -p5900:5900 -p8590:8590 -it basicmetadesktop
 
docker run -v$PWD/:/data -p8590:8590 -it basicmetadesktop

DevMetaDesktop/run.sh

+1 −1
Original line number Original line Diff line number Diff line 
#!/bin/bash

#!/bin/bash

docker run -v$PWD/:/data -p5900:5900 -p8590:8590 -it devmetadesktop
 
docker run -v$PWD/:/data -p8590:8590 -it devmetadesktop

MinimalMetaDesktop/Dockerfile

+24 −23
Original line number Original line Diff line number Diff line
@@ -49,45 +49,46 @@ COPY files/supervisord.conf /etc/supervisor/ 
RUN apt-get install xvfb xterm  -y

RUN apt-get install xvfb xterm  -y





# Install base packages for VNC server and headless desktop (2)

# Install base packages for VNC server and headless desktop (2)

RUN cd /opt && wget https://bintray.com/tigervnc/stable/download_file?file_path=tigervnc-1.8.0.x86_64.tar.gz -O tigervnc-1.8.0.x86_64.tar.gz \

#RUN cd /opt && wget https://bintray.com/tigervnc/stable/download_file?file_path=tigervnc-1.8.0.x86_64.tar.gz -O tigervnc-1.8.0.x86_64.tar.gz \

            && tar -zxvf tigervnc-1.8.0.x86_64.tar.gz \

#            && tar -zxvf tigervnc-1.8.0.x86_64.tar.gz \

            && mv tigervnc-1.8.0.x86_64 tigervnc

#            && mv tigervnc-1.8.0.x86_64 tigervnc





# Supervisord configuration

# Supervisord configuration

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

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

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

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

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

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

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



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

# Kasm VNC (modded by gtaffoni to use a socket named by an env var)



COPY files/kasmvnc-Linux-x86_64-0.9.tar.gz /tmp

# Web VNC (noVNC) v0.6.1.

RUN sudo tar xz --strip 1 -C / -f /tmp/kasmvnc-Linux-x86_64-0.9.tar.gz && rm /tmp/kasmvnc-Linux-x86_64-0.9.tar.gz

# NOTE: this is a custom version from Doro Wu (fcwu.tw@gmail.com).

RUN mkdir /usr/local/share/kasmvnc/certs

# TODO: Check differences and maybe move to 0.6.2

RUN chown metauser:metauser /usr/local/share/kasmvnc/certs

COPY files/noVNC.tar.gz /usr/lib/

COPY files/index.html /usr/local/share/kasmvnc/www/

RUN cd /usr/lib/ && tar -zxvf noVNC.tar.gz



COPY files/index.html /usr/lib/noVNC

# Other utilities



RUN apt-get install -y net-tools

RUN apt-get install -y net-tools





# Supervisord configuration

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



# X environment setup/startup

# X environment setup/startup

RUN apt-get install fluxbox -y

RUN apt-get install fluxbox -y

COPY files/xstartup /opt/tigervnc/

RUN mkdir -p /metauser_home_vanilla/.vnc

RUN chmod 755 /opt/tigervnc/xstartup

COPY files/config  /metauser_home_vanilla/.vnc

COPY files/xstartup /metauser_home_vanilla/.vnc

RUN chmod 755 /metauser_home_vanilla/.vnc/xstartup

RUN chown -R metauser:metauser /metauser_home_vanilla/.vnc





# Prepare for logs

# Prepare for logs

RUN mkdir /home/metauser/.logs && chown metauser:metauser /home/metauser/.logs

RUN mkdir /metauser_home_vanilla/.logs && chown metauser:metauser /metauser_home_vanilla/.logs





# Rename metauser home folder as a "vanilla" home folder

# Rename metauser home folder as a "vanilla" home folder

RUN mv /home/metauser /metauser_home_vanilla

#RUN mv /home/metauser /metauser_home_vanilla





# Add fluxbox customisations

# Add fluxbox customisations

COPY files/dot_fluxbox /metauser_home_vanilla/.fluxbox

COPY files/dot_fluxbox /metauser_home_vanilla/.fluxbox

RUN chown -R metauser:metauser /metauser_home_vanilla/.fluxbox

RUN chown -R metauser:metauser /metauser_home_vanilla/.fluxbox

COPY files/background.jpg /usr/share/images/fluxbox/background.jpg

COPY files/background.jpg /usr/share/images/fluxbox/background.jpg









# Give write access to anyone to the home folder so the entrypoint will be able

# Give write access to anyone to the home folder so the entrypoint will be able

# to copy over the /home/matauser_vanilla into /home/metauser (for Singularity)

# to copy over the /home/matauser_vanilla into /home/metauser (for Singularity)

RUN chmod 777 /home

RUN chmod 777 /home

MinimalMetaDesktop/files/config

0 → 100644
+10 −0
Original line number Original line Diff line number Diff line 
## Supported server options to pass to vncserver upon invocation can be listed

## in this file. See the following manpages for more: vncserver(1) Xvnc(1).

## Several common ones are shown below. Uncomment and modify to your liking.

##

# securitytypes=vncauth,tlsvnc

# desktop=sandbox

# geometry=2000x1200

# localhost

# alwaysshared

username=metauser

MinimalMetaDesktop/files/entrypoint.sh

+25 −12
Original line number Original line Diff line number Diff line
@@ -61,21 +61,34 @@ else 
	  fi

	  fi

	done

	done





	

    #---------------------

    #---------------------

    #   Password

    #   Password

    #---------------------

    #---------------------





    if [ "x$AUTH_PASS" != "x" ]; then

    if [ "x$AUTH_PASS" != "x" ]; then

        echo "[INFO] Setting up VNC password..."

        echo "[INFO] Setting up VNC password..."

	    mkdir -p /home/metauser/.vnc

	    /opt/tigervnc/usr/bin/vncpasswd -f <<< $AUTH_PASS > /home/metauser/.vnc/passwd

	    chmod 600 /home/metauser/.vnc/passwd

	    export VNC_AUTH=True

    else

    else

	    echo "[INFO] Not setting up any VNC password"

        echo "[INFO] Setting up default VNC password (metapassword)"

        AUTH_PASS=metapass

    fi            

    /usr/local/bin/kasmvncpasswd -f <<< $AUTH_PASS > /home/metauser/.kasmpasswd

    chmod 600 /home/metauser/.kasmpasswd

    export VNC_AUTH=True







    #---------------------

    #   User

    #---------------------



    if [ "x$AUTH_USER" != "x" ]; then

        echo "[INFO] Setting up VNC user..."

        sed -i -e "s/username=metauser/username=$AUTH_USER/" /home/metauser/.vnc/config 

    else

        echo "[INFO] Setting up default VNC user (metauser)"

    fi

    fi





							

	echo "[INFO] Setting new prompt @$CONTAINER_NAME container"

	echo "[INFO] Setting new prompt @$CONTAINER_NAME container"

	echo 'export PS1="${debian_chroot:+($debian_chroot)}\u@$CONTAINER_NAME@\h:\w\$ "' >> /home/metauser/.bashrc

	echo 'export PS1="${debian_chroot:+($debian_chroot)}\u@$CONTAINER_NAME@\h:\w\$ "' >> /home/metauser/.bashrc