Update Conda Python versions and fix workshop startup.

educates · Jun 22, 2022 · 0cae66a · 0cae66a
1 parent 57f6f35
commit 0cae66a
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 19 deletions.
diff --git a/workshop-images/conda-environment/Dockerfile b/workshop-images/conda-environment/Dockerfile
@@ -7,9 +7,9 @@ FROM ${IMAGE_REPOSITORY}/${BASE_IMAGE_NAME}:${PACKAGE_VERSION}
 ENV CONDA_DIR=/opt/conda \
     PATH=/opt/conda/bin:$PATH
 
-ENV MINICONDA_VERSION=4.9.2 \
-    MINICONDA_MD5=b4e46fcc8029e2cfa731b788f25b1d36 \
-    CONDA_VERSION=4.9.2
+ENV MINICONDA_VERSION=4.12.0 \
+    MINICONDA_MD5=7843dd7d0a2c53b0df37ca8189672992 \
+    CONDA_VERSION=4.12.0
 
 RUN mkdir -p $CONDA_DIR && \
     cd /tmp && \
@@ -32,21 +32,16 @@ RUN mkdir -p $CONDA_DIR && \
     fix-permissions /home/eduk8s
 
 RUN conda install --quiet --yes \
-    'notebook=6.4.8' \
-    'jupyterlab=3.2.9' && \
+    'notebook=6.4.12' \
+    'jupyterlab=3.4.3' && \
     conda clean --all -f -y && \
     npm cache clean --force && \
     rm -rf $CONDA_DIR/share/jupyter/lab/staging && \
     rm -rf /home/eduk8s/.cache/yarn && \
     fix-permissions $CONDA_DIR && \
     fix-permissions /home/eduk8s
 
-#RUN mkdir -p /opt/code-server/extensions && \
-#    curl -sL -o /opt/code-server/extensions/ms-python.python-2021.12.1559732655.vsix https://open-vsx.org/api/ms-python/python/2021.12.1559732655/file/ms-python.python-2021.12.1559732655.vsix
-
-#COPY --chown=1001:0 opt/code-server/. /opt/code-server/
-
-COPY --chown=1001:0 workshop /opt/eduk8s/workshop
+COPY --chown=1001:0 opt/. /opt/
 
 COPY --chown=1001:0 start-jupyterlab.sh /opt/conda
 

diff --git a/...a-environment/workshop/setup.d/jupyter.sh → ...ment/opt/eduk8s/etc/setup.d/03-jupyter.sh b/...a-environment/workshop/setup.d/jupyter.sh → ...ment/opt/eduk8s/etc/setup.d/03-jupyter.sh
diff --git a/workshop-images/conda-environment/opt/eduk8s/etc/setup.d/11-python.sh b/workshop-images/conda-environment/opt/eduk8s/etc/setup.d/11-python.sh
diff --git a/...images/conda-environment/workshop/profile → ...a-environment/opt/eduk8s/workshop/profile b/...images/conda-environment/workshop/profile → ...a-environment/opt/eduk8s/workshop/profile
diff --git a/...nment/workshop/supervisor/jupyterlab.conf → ...duk8s/workshop/supervisor/jupyterlab.conf b/...nment/workshop/supervisor/jupyterlab.conf → ...duk8s/workshop/supervisor/jupyterlab.conf
diff --git a/workshop-images/conda-environment/resources/workshop.yaml b/workshop-images/conda-environment/resources/workshop.yaml
@@ -5,8 +5,8 @@ metadata:
 spec:
   title: Anaconda Python Environment
   description: Base workshop image for Anaconda Python environment
-  content:
-    image: ghcr.io/vmware-tanzu-labs/educates-conda-environment:master
+  workshop:
+    image: conda-environment:*
   session:
     resources:
       memory: 2Gi
@@ -27,4 +27,4 @@ spec:
       port: 8888
     dashboards:
     - name: JupyterLab
-      url: "$(ingress_protocol)://$(session_namespace)-jupyterlab.$(ingress_domain)/"
+      url: "$(ingress_protocol)://jupyterlab-$(session_namespace).$(ingress_domain)/"