Merge pull request #4 from linuxserver-labs/kasmvnc

rebase to kasmvnc

Author: aptalca

.github/workflows/call-build-image.yml

@@ -14,6 +14,6 @@ jobs:
       release_type: "github_tag"
       release_url: "https://api.github.com/repos/nomacs/nomacs"
       release_name: ""
-      target-arch: "all"
+      target-arch: "64"
     secrets:
       scarf_token: ${{ secrets.SCARF_TOKEN }}

Dockerfile

@@ -1,4 +1,4 @@
-FROM ghcr.io/linuxserver/baseimage-rdesktop-web:jammy
+FROM ghcr.io/linuxserver/baseimage-kasmvnc:ubuntujammy
 
 ARG BUILD_DATE
 ARG VERSION
@@ -67,6 +67,7 @@ RUN \
   make && \
   make install && \
   ldconfig && \
+  sed -i 's|</applications>|  <application title="nomacs \| Image Lounge" type="normal">\n    <maximized>yes</maximized>\n  </application>\n</applications>|' /etc/xdg/openbox/rc.xml && \
   echo "**** clean up ****" && \
   apt-get purge --auto-remove -y \
     build-essential \

README.md

@@ -56,7 +56,37 @@ The architectures supported by this image are:
 
 ## Application Setup
 
-The webui will be accessible at http://SERVERIP:PORT
+The webui will be accessible at http://SERVERIP:3000 or https://SERVERIP:3001
+
+### Options in all KasmVNC based GUI containers
+
+This container is based on [Docker Baseimage KasmVNC](https://github.com/linuxserver/docker-baseimage-kasmvnc) which means there are additional environment variables and run configurations to enable or disable specific functionality.
+
+#### Optional environment variables
+
+| Variable | Description |
+| :----: | --- |
+| CUSTOM_PORT | Internal port the container listens on for http if it needs to be swapped from the default 3000. |
+| CUSTOM_HTTPS_PORT | Internal port the container listens on for https if it needs to be swapped from the default 3001. |
+| CUSTOM_USER | HTTP Basic auth username, abc is default. |
+| PASSWORD | HTTP Basic auth password, abc is default. If unset there will be no auth |
+| SUBFOLDER | Subfolder for the application if running a subfolder reverse proxy, need both slashes IE `/subfolder/` |
+| TITLE | The page title displayed on the web browser, default "KasmVNC Client". |
+| FM_HOME | This is the home directory (landing) for the file manager, default "/config". |
+| START_DOCKER | If set to false a container with privilege will not automatically start the DinD Docker setup. |
+| DRINODE | If mounting in /dev/dri for [DRI3 GPU Acceleration](https://www.kasmweb.com/kasmvnc/docs/master/gpu_acceleration.html) allows you to specify the device to use IE `/dev/dri/renderD128` |
+
+#### Optional run configurations
+
+| Variable | Description |
+| :----: | --- |
+| `--privileged` | Will start a Docker in Docker (DinD) setup inside the container to use docker in an isolated environment. For increased performance mount the Docker directory inside the container to the host IE `-v /home/user/docker-data:/var/lib/docker`. |
+| `-v /var/run/docker.sock:/var/run/docker.sock` | Mount in the host level Docker socket to either interact with it via CLI or use Docker enabled applications. |
+| `--device /dev/dri:/dev/dri` | Mount a GPU into the container, this can be used in conjunction with the `DRINODE` environment variable to leverage a host video card for GPU accelerated appplications. Only **Open Source** drivers are supported IE (Intel,AMDGPU,Radeon,ATI,Nouveau) |
+
+### Lossless mode
+
+This container is capable of delivering a true lossless image at a high framerate to your web browser by changing the Stream Quality preset to "Lossless", more information [here](https://www.kasmweb.com/docs/latest/how_to/lossless.html#technical-background). In order to use this mode from a non localhost endpoint the HTTPS port on 3001 needs to be used. If using a reverse proxy to port 3000 specific headers will need to be set as outlined [here](https://github.com/linuxserver/docker-baseimage-kasmvnc#lossless).
 
 ## Usage
 
@@ -79,6 +109,7 @@ services:
       - TZ=Europe/London
     ports:
       - 3000:3000
+      - 3001:3001
     volumes:
       - /path/to/appdata:/config
     restart: unless-stopped
@@ -94,6 +125,7 @@ docker run -d \
   -e PGID=1000 \
   -e TZ=Europe/London \
   -p 3000:3000 \
+  -p 3001:3001 \
   -v /path/to/appdata:/config \
   --restart unless-stopped \
   lscr.io/linuxserver-labs/nomacs:latest
@@ -108,7 +140,8 @@ Container images are configured using parameters passed at runtime (such as thos
 | `-e PUID=1000` | for UserID - see below for explanation |
 | `-e PGID=1000` | for GroupID - see below for explanation |
 | `-e TZ=Europe/London` | Specify a timezone to use EG Europe/London. |
-| `-p 3000` | The webui port. |
+| `-p 3000` | The webui http port. |
+| `-p 3001` | The webui https port. |
 | `-v /config` | The folder on host you'd like the app data to reside in. |
 | `--security-opt seccomp=unconfined` | For Docker Engine only, many modern gui apps need this to function as syscalls are unkown to Docker. |
 
@@ -221,5 +254,6 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **27.03.22:** - Rebase to the new kasmvnc baseimage. Deprecate arm32v7 build as the new base does not support it.
 * **10.12.22:** - Add support for AVIF and JPEG XL.
 * **12.10.22:** - Initial Release.

root/defaults/menu.xml

@@ -3,6 +3,5 @@
 <menu id="root-menu" label="MENU">
 <item label="Nomacs"><action name="Execute"><command>/usr/local/bin/nomacs</command></action></item>
 <item label="xterm" icon="/usr/share/pixmaps/xterm-color_48x48.xpm"><action name="Execute"><command>/usr/bin/xterm</command></action></item>
-<item label="Reload OB"><action name="Reconfigure"/></item>
 </menu>
-</openbox_menu>
+</openbox_menu>

root/etc/s6-overlay/s6-rc.d/init-nomacs-config/run

@@ -4,9 +4,9 @@
 if [ ! -f /config/.config/openbox/menu.xml ]; then
     mkdir -p /config/.config/openbox
     cp /defaults/menu.xml /config/.config/openbox/menu.xml
-    chown -R abc:abc /config/.config
+    lsiown -R abc:abc /config/.config
 fi
 
 # permissions
-chown -R abc:abc \
+lsiown -R abc:abc \
     /config \