From fdc4e3b57d43b7b1c2d734e74655399ae28b4572 Mon Sep 17 00:00:00 2001
From: Elian Loraux <elian.loraux@tetras-libre.fr>
Date: Tue, 25 Feb 2025 16:39:38 +0100
Subject: [PATCH] add condition to install spyder and anaconda if variable is
define at true in .env
---
.env.sample | 15 ++++++++++++++-
Dockerfile | 36 ++++++++++++++----------------------
docker-compose.yml | 5 ++++-
3 files changed, 32 insertions(+), 24 deletions(-)
diff --git a/.env.sample b/.env.sample
index be9885d..0368d95 100644
--- a/.env.sample
+++ b/.env.sample
@@ -1,6 +1,19 @@
#COMPOSE_FILE=docker-compose.yml:traefik.yml
COMPOSE_FILE=docker-compose.yml:ports.yml
-PASS=MON_SUPER_MOT_DE_PASSE
+
+PASS=MON_SUPER_MOT_DE_PASSE
NAME=kasmVNC
HOST=kasmVNC.tetras-lab.io
+
+# === install module === #
+#
+# Put variable at true to install
+# Put variable at false to do not install
+#
+# ====================== #
+
+# Install Spyder (python IDE)
+SPYDER=true
+# Install anaconda (distribution platform for Python and R)
+ANACONDA=true
diff --git a/Dockerfile b/Dockerfile
index 4e92324..32446b9 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,34 +1,26 @@
FROM kasmweb/core-ubuntu-noble:1.16.0 as kasmvnc-base
+ARG SPYDER
+ARG ANACONDA
+
USER root
RUN apt-get update
RUN mkdir /install
-# === Install anaconda === #
-FROM kasmvnc-base as kasmvnc-anaconda
-
WORKDIR /install
-
-RUN wget https://repo.anaconda.com/archive/Anaconda3-2024.02-1-Linux-x86_64.sh
-
-RUN bash Anaconda3-2024.02-1-Linux-x86_64.sh -b
-
-RUN chmod u+x /home/kasm-user/anaconda3/etc/profile.d/conda.sh
-
-RUN echo "source ~/anaconda3/etc/profile.d/conda.sh" >> /home/kasm-default-profile/.bashrc
-RUN echo "conda activate" >> /home/kasm-default-profile/.bashrc
-
-USER 1000
-
# === Install Spyder === #
-FROM kasmvnc-base as kasmvnc-spyder
-RUN apt-get install -y python3-spyder
-USER 1000
-
-# === Install mathlab === #
-FROM kasmvnc-base as kasmvnc-mathlab
+RUN if [ "$SPYDER" = true ] ; then apt-get install -y python3-spyder; fi
-RUN apt-get install -y python3-spyder
+# === Install anaconda === #
+RUN if [ "$ANACONDA" = true ] ; then \
+ wget https://repo.anaconda.com/archive/Anaconda3-2024.02-1-Linux-x86_64.sh; \
+ bash Anaconda3-2024.02-1-Linux-x86_64.sh -b; \
+ chmod u+x /home/kasm-user/anaconda3/etc/profile.d/conda.sh; \
+ echo "source ~/anaconda3/etc/profile.d/conda.sh" >> /home/kasm-default-profile/.bashrc; \
+ echo "conda activate" >> /home/kasm-default-profile/.bashrc; \
+ fi
+
+WORKDIR /home/kasm-user
USER 1000
diff --git a/docker-compose.yml b/docker-compose.yml
index 30b3163..6833f9a 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -4,12 +4,15 @@ services:
build:
context: ./
target: kasmvnc-base
-
+ args:
+ - SPYDER=${SPYDER}
+ - ANACONDA=${ANACONDA}
container_name: KasmVNC-ubuntu
volumes:
- ./homedir:/home/kasm_user:rw
environment:
- VNC_PW=${PASS}
+
volumes:
homedir:
--
GitLab