From b3b44e3fa83a917781981f82ad3b18dac0d8133a Mon Sep 17 00:00:00 2001
From: David Beniamine <david.beniamine@tetras-libre.fr>
Date: Wed, 5 Mar 2025 16:05:55 +0100
Subject: [PATCH] =?UTF-8?q?WIP=C2=A0changing=20user=20name?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
docker-compose.yml | 2 ++
docker/Dockerfile | 3 +++
docker/custom_startup.sh | 18 +++++++++---------
3 files changed, 14 insertions(+), 9 deletions(-)
diff --git a/docker-compose.yml b/docker-compose.yml
index 2dba154..2be139d 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -6,6 +6,7 @@ services:
args:
- SPYDER=${SPYDER}
- ANACONDA=${ANACONDA}
+ - KASM_USER=${USER}
image: "kasmvnc-ubuntu-noble:spyder-${SPYDER}_anaconda-${ANACONDA}"
container_name: KasmVNC-ubuntu
volumes:
@@ -15,6 +16,7 @@ services:
- VNC_PW=${PASS}
- SPYDER=${SPYDER}
- ANACONDA=${ANACONDA}
+ - KASM_USER=${USER}
volumes:
diff --git a/docker/Dockerfile b/docker/Dockerfile
index a6cc1be..055cbe0 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -11,6 +11,7 @@ WORKDIR $HOME
ARG SPYDER
ARG ANACONDA
ARG ANACONDA_VERS=Anaconda3-2024.02-1
+ARG KASM_USER
RUN apt-get update && \
@@ -27,6 +28,8 @@ RUN apt-get update && \
locale-gen --purge fr_FR.UTF-8 en_US.UTF-8
RUN mkdir /install
+RUN for f in /dockerstartup/*.sh; do sed -i -e "s/kasm_user/$KASM_USER/g" $f; done
+
WORKDIR /install
# === Install Spyder === #
diff --git a/docker/custom_startup.sh b/docker/custom_startup.sh
index d4b11c8..2c84e09 100755
--- a/docker/custom_startup.sh
+++ b/docker/custom_startup.sh
@@ -1,11 +1,11 @@
#!/bin/bash
-VNC_USER=kasm-user
+VNC_HOME=/home/kasm-user
-sed -i -e "s@kasm-default-profile@$VNC_USER@g" ~/anaconda3/etc/profile.d/conda.sh
+sed -i -e "s@kasm-default-profile@$KASM_USER@g" ~/anaconda3/etc/profile.d/conda.sh
# Add changepassword icon
-mkdir -p /home/$VNC_USER/Desktop
-cat <<EOF > /home/$VNC_USER/Desktop/users.desktop
+mkdir -p $VNC_HOME/Desktop
+cat <<EOF > $VNC_HOME/Desktop/users.desktop
[Desktop Entry]
Type=Link
Name=Change password
@@ -15,23 +15,23 @@ terminal=true
EOF
if [ $ANACONDA == 'true' ]; then
-cat <<eof > /home/$VNC_USER/Desktop/anaconda.desktop
+cat <<eof > $VNC_HOME/Desktop/anaconda.desktop
[Desktop Entry]
Type=Application
Name=Anaconda
Terminal=true
-Icon=/home/$VNC_USER/anaconda3/lib/python3.8/site-packages/anaconda_navigator/static/images/anaconda.png
-Exec=/home/$VNC_USER/anaconda3/bin/anaconda-navigator
+Icon=$VNC_HOME/anaconda3/lib/python3.8/site-packages/anaconda_navigator/static/images/anaconda.png
+Exec=$VNC_HOME/anaconda3/bin/anaconda-navigator
eof
fi
if [ $SPYDER == 'true' ]; then
-cat <<eof > /home/$VNC_USER/Desktop/spyder.desktop
+cat <<eof > $VNC_HOME/Desktop/spyder.desktop
[Desktop Entry]
Type=Application
Name=Spyder
Terminal=true
-Icon=/home/$VNC_USER/anaconda3/share/icons/spyder.png
+Icon=$VNC_HOME/anaconda3/share/icons/spyder.png
Exec=$(which spyder)
eof
fi
--
GitLab