From a1c135ad8bb03ca004d7f66f89896a50a0752a57 Mon Sep 17 00:00:00 2001
From: daxid <david.rouquet@tetras-libre.fr>
Date: Tue, 8 Apr 2025 21:38:51 +0200
Subject: [PATCH] cleaning in env, adding some webtop vars

---
 .env.sample        | 20 +++++++++++---------
 docker-compose.yml | 17 ++++++++---------
 2 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/.env.sample b/.env.sample
index cee116f..97577dd 100644
--- a/.env.sample
+++ b/.env.sample
@@ -1,8 +1,6 @@
 #COMPOSE_FILE=docker-compose.yml:traefik.yml
 COMPOSE_FILE=docker-compose.yml:ports.yml
 
-
-PASS=MON_SUPER_MOT_DE_PASSE
 NAME=kasmVNC
 VNC_USER=kasm
 HOST=kasmVNC.tetras-lab.io
@@ -10,23 +8,27 @@ PORT=3001
 UID=1000
 GID=1000
 
-# === install module === #
-#
-# Put variable at true to install
-# Put variable at false to do not install
-#
+# ===  Webtop specific variables === #
+# https://docs.linuxserver.io/images/docker-webtop/#options-in-all-kasmvnc-based-gui-containers
 # ====================== #
 
+CUSTOM_USER=kasmuser
+PASSWORD=MON_SUPER_MOT_DE_PASSE
+TITLE=Webtop
 LC_ALL=fr_FR-UTF-8
 TZ=Europe/Paris
+
+# === install/config module === #
+# Set variable to true to install or enable,
+# false otherwise.
+# ====================== #
+
 # Install anaconda (distribution platform for Python and R)
 ANACONDA=true
 # Install QGIS
 QGIS=true
 # Install JAVA tell which jdk ie default-jdk openjdk-8 etc.
 JAVA=
-# Install gfortran set only number ex 10
-GFORTRAN=
 # Should the user have sudo rights
 # **only home is a volume, any modifcation in other FS will be lost**
 SUDO=false
diff --git a/docker-compose.yml b/docker-compose.yml
index e75ec49..b28ff2f 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -7,23 +7,22 @@ services:
         - QGIS=${QGIS}
         - ANACONDA=${ANACONDA}
         - JAVA=${JAVA}
-        - GFORTRAN=${GFORTRAN}
-    image: "webtop-ubuntu-mate:anaconda-${ANACONDA}_QGIS-${QGIS}_JAVA-${JAVA}_GFORTRAN-${GFORTRAN}_SUDO-${SUDO}"
+    image: "webtop-ubuntu-mate:anaconda-${ANACONDA}_QGIS-${QGIS}_JAVA-${JAVA}_SUDO-${SUDO}"
     shm_size: '1gb'
     security_opt:
       - seccomp:unconfined #optional
     volumes:
       - homedir:/config:rw
     environment:
-      - PASSWORD=${PASS}
       - ANACONDA=${ANACONDA}
-      - CUSTOM_USER=${VNC_USER}
-      - PUID=${UID}
-      - PGID=${GID}
-      - TZ=${TZ}
+      #- PUID=${UID}
+      #- PGID=${GID}
       - SUDO=${SUDO}
-    devices:
-      - /dev/dri:/dev/dri #optional
+      - CUSTOM_USER=${CUSTOM_USER}
+      - PASSWORD=${PASSWORD}
+      - TITLE=${TITLE}
+      - LC_ALL=fr_FR-UTF-8
+      - TZ=${TZ}
 
 volumes:
   homedir:
-- 
GitLab