diff --git a/README.md b/README.md index 6d8e35a..0d351e0 100644 --- a/README.md +++ b/README.md @@ -127,8 +127,9 @@ configure by setting environment variables when you create container. * `REMOTE_DESKTOP`: nomachine (default) , kasmvnc, novnc. * `VNC_THREADS`: RectThread num for vncserver, only used when `REMOTE_DESKTOP` = kasmvnc. default is 2, set 0 for auto. -* `HTTPS_CERT`: SSL pem certificate file path to use for https server(kasmvnc/nonvc) -* `HTTPS_CERT_KEY`: SSL pem key file path to use for https server(kasmvnc/nonvc) +* `HTTPS_CERT`: SSL pem certificate file path to use for https server(kasmvnc/nonvc). +* `HTTPS_CERT_KEY`: SSL pem key file path to use for https server(kasmvnc/nonvc). +* `DISABLE_HTTPS`: set 1 for http server mode, which is useful for reverse proxy. #### Enable GPU hardware-accelerated rendering diff --git a/ubuntu-desktop/docker_config/entrypoint.sh b/ubuntu-desktop/docker_config/entrypoint.sh index b08cac1..ce62ef3 100755 --- a/ubuntu-desktop/docker_config/entrypoint.sh +++ b/ubuntu-desktop/docker_config/entrypoint.sh @@ -34,7 +34,11 @@ fi # start dbus /etc/init.d/dbus start # start coder server -su $USER -c "code-server --cert $HTTPS_CERT --cert-key $HTTPS_CERT_KEY --bind-addr=0.0.0.0:5000 &" +if [ ! -z ${DISABLE_HTTPS+x} ]; then + su $USER -c "code-server --bind-addr=0.0.0.0:5000 &" +else + su $USER -c "code-server --cert $HTTPS_CERT --cert-key $HTTPS_CERT_KEY --bind-addr=0.0.0.0:5000 &" +fi # start remote desktop if [ "${REMOTE_DESKTOP}" = "nomachine" ]; then echo "start nomachine" diff --git a/ubuntu-desktop/docker_config/install_code_server.sh b/ubuntu-desktop/docker_config/install_code_server.sh index 2c4d12e..8ab5c60 100755 --- a/ubuntu-desktop/docker_config/install_code_server.sh +++ b/ubuntu-desktop/docker_config/install_code_server.sh @@ -1,5 +1,5 @@ #!/bin/bash -version=4.93.1 +version=4.103.2 arch=$(dpkg --print-architecture) codename=$(lsb_release --short --codename) if [[ $codename == 'bionic' ]]; then diff --git a/ubuntu-desktop/docker_config/install_novnc.sh b/ubuntu-desktop/docker_config/install_novnc.sh index 1c4f5d8..c45faac 100755 --- a/ubuntu-desktop/docker_config/install_novnc.sh +++ b/ubuntu-desktop/docker_config/install_novnc.sh @@ -1,5 +1,5 @@ #!/bin/sh -NOVNC_VERSION=1.4.0 +NOVNC_VERSION=1.6.0 # install turbovnc wget -q -O- https://packagecloud.io/dcommander/turbovnc/gpgkey | gpg --dearmor >/etc/apt/trusted.gpg.d/TurboVNC.gpg wget -O /etc/apt/sources.list.d/TurboVNC.list https://raw.githubusercontent.com/TurboVNC/repo/main/TurboVNC.list diff --git a/ubuntu-desktop/docker_config/start_kasmvnc.sh b/ubuntu-desktop/docker_config/start_kasmvnc.sh index f392b45..8c06946 100755 --- a/ubuntu-desktop/docker_config/start_kasmvnc.sh +++ b/ubuntu-desktop/docker_config/start_kasmvnc.sh @@ -5,6 +5,10 @@ if [ ! -f "/home/$USER/.vnc/passwd" ]; then fi rm -rf /tmp/.X1000-lock /tmp/.X11-unix/X1000 # start kasmvnc -su $USER -c "kasmvncserver :1000 -select-de xfce -interface 0.0.0.0 -websocketPort 4000 -cert $HTTPS_CERT -key $HTTPS_CERT_KEY -RectThreads $VNC_THREADS" +if [ ! -z ${DISABLE_HTTPS+x} ]; then + su $USER -c "kasmvncserver :1000 -select-de xfce -interface 0.0.0.0 -websocketPort 4000 -sslOnly 0 -RectThreads $VNC_THREADS" +else + su $USER -c "kasmvncserver :1000 -select-de xfce -interface 0.0.0.0 -websocketPort 4000 -cert $HTTPS_CERT -key $HTTPS_CERT_KEY -RectThreads $VNC_THREADS" +fi su $USER -c "pulseaudio --start" tail -f /home/$USER/.vnc/*.log diff --git a/ubuntu-desktop/docker_config/start_novnc.sh b/ubuntu-desktop/docker_config/start_novnc.sh index f3b14a0..f26e865 100755 --- a/ubuntu-desktop/docker_config/start_novnc.sh +++ b/ubuntu-desktop/docker_config/start_novnc.sh @@ -7,5 +7,9 @@ rm -rf /tmp/.X1000-lock /tmp/.X11-unix/X1000 # start TurboVNC su $USER -c "/opt/TurboVNC/bin/vncserver :1000 -rfbport 5900" # start NoVNC -su $USER -c "/opt/noVNC/utils/novnc_proxy --vnc localhost:5900 --ssl-only --cert $HTTPS_CERT --key $HTTPS_CERT_KEY --listen 4000 --heartbeat 10 &" +if [ ! -z ${DISABLE_HTTPS+x} ]; then + su $USER -c "/opt/noVNC/utils/novnc_proxy --vnc localhost:5900 --listen 4000 --heartbeat 10 &" +else + su $USER -c "/opt/noVNC/utils/novnc_proxy --vnc localhost:5900 --ssl-only --cert $HTTPS_CERT --key $HTTPS_CERT_KEY --listen 4000 --heartbeat 10 &" +fi tail -f /home/$USER/.vnc/*.log