From 3786f01c2f1131726e839cc14c128f30a1403130 Mon Sep 17 00:00:00 2001
From: Elian Loraux <elian.loraux@tetras-libre.fr>
Date: Fri, 1 Mar 2024 10:20:45 +0100
Subject: [PATCH] clean install of spyder
---
Dockerfile | 23 +++++++++++--------
.../install-spyder-ubuntu.sh | 3 +++
install-script/install-spyder.sh | 3 +++
3 files changed, 20 insertions(+), 9 deletions(-)
rename patch-spyder.sh => install-script/install-spyder-ubuntu.sh (94%)
create mode 100644 install-script/install-spyder.sh
diff --git a/Dockerfile b/Dockerfile
index 3b3aac0..afe9190 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,18 +1,23 @@
-FROM kasmweb/ubuntu-jammy-desktop:1.14.0
+FROM kasmweb/core-debian-bookworm:1.15.0
USER root
-ENV STARTUPDIR /dockerstartup
-
RUN apt-get update
RUN apt-get upgrade -y
-RUN apt-get install spyder3 -y
-ADD patch-spyder.sh /
-RUN chmod +x /patch-spyder.sh
-RUN /patch-spyder.sh
-#RUN echo "if [ -d "$HOME" ]; then cp /etc/skel/.* $HOME; fi" > $STARTUPDIR/custom_startup.sh \
-#& chmod +x $STARTUPDIR/custom_startup.sh
+ENV INST_DIR=/install \
+ INST_SCRIPTS="/install-spyder.sh"
+
+
+# Copy install scripts
+RUN mkdir $INST_DIR
+COPY ./install-script/ $INST_DIR
+
+# Run installations
+RUN \
+ for SCRIPT in $INST_SCRIPTS; do \
+ bash ${INST_DIR}${SCRIPT} || exit 1; \
+ done
USER 1000
diff --git a/patch-spyder.sh b/install-script/install-spyder-ubuntu.sh
similarity index 94%
rename from patch-spyder.sh
rename to install-script/install-spyder-ubuntu.sh
index f5916d9..b9efe95 100755
--- a/patch-spyder.sh
+++ b/install-script/install-spyder-ubuntu.sh
@@ -1,5 +1,8 @@
#!/usr/bin/env bash
+# Installation de spyder3
+apt-get install spyder3 -y
+
# Ce script resout un problème de Spyder 4.2.1
# La résolution de se problème ressort du poste stack overflow suivant
# https://stackoverflow.com/questions/72114520/error-when-starting-spyder-on-ubuntu-22-04
diff --git a/install-script/install-spyder.sh b/install-script/install-spyder.sh
new file mode 100644
index 0000000..d551672
--- /dev/null
+++ b/install-script/install-spyder.sh
@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+
+apt-get install spyder -y
--
GitLab