From 18a35c50f5ee30b984ed92cf156944e552fb8bcd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Franti=C5=A1ek=20Dvo=C5=99=C3=A1k?= <valtri@civ.zcu.cz>
Date: Fri, 2 Aug 2024 16:10:41 +0200
Subject: [PATCH] More components to the extra AI image

---
 single-user-ai/Dockerfile | 18 ++++++++++++++++++
 single-user/Dockerfile    | 13 +------------
 2 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/single-user-ai/Dockerfile b/single-user-ai/Dockerfile
index 9ba9184..13d90cc 100644
--- a/single-user-ai/Dockerfile
+++ b/single-user-ai/Dockerfile
@@ -4,6 +4,24 @@ FROM $BASE_IMAGE
 
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 
+RUN mamba install -y --quiet \
+        tensorflow \
+    && conda clean --all
+
+# See https://github.com/mamba-org/mamba/issues/336
+# pytorch is not installing properly with mamba
+RUN mamba install -y pytorch torchvision torchaudio cpuonly -c pytorch -c anaconda -c conda-forge \
+    && mamba install -y --quiet fastai -c fastai \
+    && conda clean --all
+
+# packages not in conda
+RUN pip install --no-cache-dir \
+        tflearn
+
+# not installable from mamba for now
+RUN pip install --no-cache-dir \
+        eo-learn
+
 # not installable from mamba for now
 RUN pip install --no-cache-dir \
         elyra
diff --git a/single-user/Dockerfile b/single-user/Dockerfile
index 8a2914b..7f684a2 100644
--- a/single-user/Dockerfile
+++ b/single-user/Dockerfile
@@ -35,16 +35,6 @@ RUN mamba install -y --quiet \
         jupyter-resource-usage \
     && conda clean --all
 
-# not installable from mamba for now
-RUN pip install --no-cache-dir \
-        eo-learn
-
-# See https://github.com/mamba-org/mamba/issues/336
-# pytorch is not installing properly with mamba
-RUN mamba install -y pytorch torchvision torchaudio cpuonly -c pytorch -c anaconda -c conda-forge \
-    && mamba install -y --quiet fastai -c fastai \
-    && conda clean --all
-
 # Octave, install on a different environment
 # Octave from conda won't build packages
 # see https://discourse.jupyter.org/t/installing-octave-packages-with-binder/4206
@@ -92,8 +82,7 @@ RUN pip install --no-cache-dir \
         git+https://github.com/EGI-Foundation/egi-notebooks-addons@0.1.3 \
         h5glance \
         nbtop \
-	panel \
-        tflearn
+        panel
 
 # EMSO
 # python3.7, install on a different environment