From 9764deb61cbf42e5883334ff30dced20f66a87cb Mon Sep 17 00:00:00 2001
From: Valentin <valentin.kozlov@gmail.com>
Date: Tue, 16 Jan 2024 12:57:33 +0100
Subject: [PATCH] Upd: Removes depricated stage 'Render metadata'; Removes
 Jupyterlab from Dockerfile as it is handled by deep-start (#3)

---
 Dockerfile  | 16 ++++++----------
 Jenkinsfile | 14 --------------
 2 files changed, 6 insertions(+), 24 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index ffc9f12..7167fad 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -61,25 +61,21 @@ RUN curl -O https://downloads.rclone.org/rclone-current-linux-amd64.deb && \
 
 ENV RCLONE_CONFIG=/srv/.rclone/rclone.conf
 
-# Initialization scripts
+# Install deep-start script
+# * allows to run shorter command "deep-start"
+# * allows to install jupyterlab or code-server (vscode),
+#   if requested during container creation
 RUN git clone https://github.com/deephdc/deep-start /srv/.deep-start && \
-    ln -s /srv/.deep-start/deep-start.sh /usr/local/bin/deep-start && \
-    ln -s /srv/.deep-start/run_jupyter.sh /usr/local/bin/run_jupyter
+    ln -s /srv/.deep-start/deep-start.sh /usr/local/bin/deep-start
 
-# Install JupyterLab
-ENV JUPYTER_CONFIG_DIR /srv/.deep-start/
 # Necessary for the Jupyter Lab terminal
 ENV SHELL /bin/bash
-RUN if [ "$jlab" = true ]; then \
-    # by default has to work (1.2.0 wrongly required nodejs and npm)
-    pip3 install --no-cache-dir jupyterlab ; \
-    else echo "[INFO] Skip JupyterLab installation!"; fi
 
 # Install user app
 
 RUN apt-get update && apt-get  -y --no-install-recommends install libgl1 libglib2.0-0 libsm6 libxrender1 libxext6 unzip psmisc
 
-RUN git clone -b $branch https://github.com/ai4eosc-psnc/integrated_plant_protection && \
+RUN git clone -b $branch --depth 1 https://github.com/ai4eosc-psnc/integrated_plant_protection && \
     cd  integrated_plant_protection && \
     pip3 install --no-cache-dir -e . && \
     cd ..
diff --git a/Jenkinsfile b/Jenkinsfile
index 3a0a813..e8aa3e0 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -108,19 +108,5 @@ pipeline {
             }
         }
 
-        stage("Render metadata on the marketplace") {
-            when {
-                allOf {
-                    branch 'master'
-                    changeset 'metadata.json'
-                }
-            }
-            steps {
-                script {
-                    def job_result = JenkinsBuildJob("Pipeline-as-code/deephdc.github.io/pelican")
-                    job_result_url = job_result.absoluteUrl
-                }
-            }
-        }
     }
 }