[jupyterhub] Add downstream vim image

.gitlab-ci.yml

@@ -8,7 +8,8 @@ build ubuntu:
   script:
     - image_name="${CI_REGISTRY}/${CI_PROJECT_PATH,,}"
     - podman build --cgroup-manager=cgroupfs --pull -t "${image_name}/ubuntu" ubuntu
-    - podman build --cgroup-manager=cgroupfs -t "${image_name}/jupyterhub" jupyterhub
+    - podman build --cgroup-manager=cgroupfs -t "${image_name}/jupyterhub" jupyterhub/base
+    - podman build --cgroup-manager=cgroupfs -t "${image_name}/jupyterhub_vim" jupyterhub/vim
 
 deploy ubuntu:
   stage: deploy
@@ -25,5 +26,9 @@ deploy ubuntu:
     - podman push "${image_name}/jupyterhub:$calver"
     - podman image rm "${image_name}/jupyterhub:$calver"
     - docker pull "${image_name}/jupyterhub:$calver"
+    - podman tag "${image_name}/jupyterhub_vim" "${image_name}/jupyterhub_vim:$calver"
+    - podman push "${image_name}/jupyterhub_vim:$calver"
+    - podman image rm "${image_name}/jupyterhub_vim:$calver"
+    - docker pull "${image_name}/jupyterhub_vim:$calver"
   after_script:
     - podman logout "${CI_REGISTRY}"

jupyterhub/Dockerfile → jupyterhub/base/Dockerfile

@@ -9,7 +9,7 @@ RUN apt-get update && \
         curl && \
     apt-get clean
 
-ARG PYTHON_VERSION=3.8
+ENV JUPYTERHUB_PYTHON_VERSION=3.8
 
 RUN curl -sL https://deb.nodesource.com/setup_10.x | bash - && \
     apt-get update && \
@@ -20,31 +20,31 @@ RUN curl -sL https://deb.nodesource.com/setup_10.x | bash - && \
         openjdk-11-jre-headless && \
     apt-get clean
 
-RUN python${PYTHON_VERSION} -m pip --no-cache-dir install \
+RUN python${JUPYTERHUB_PYTHON_VERSION} -m pip --no-cache-dir install \
         jupyterlab \
         jupyterhub \
         ipympl \
 	&& \
-    python${PYTHON_VERSION} -m jupyter labextension install \
+    python${JUPYTERHUB_PYTHON_VERSION} -m jupyter labextension install \
         @jupyter-widgets/jupyterlab-manager && \
-    python${PYTHON_VERSION} -m jupyter serverextension enable --sys-prefix --py jupyterlab && \
-    python${PYTHON_VERSION} -m jupyter labextension install \
+    python${JUPYTERHUB_PYTHON_VERSION} -m jupyter serverextension enable --sys-prefix --py jupyterlab && \
+    python${JUPYTERHUB_PYTHON_VERSION} -m jupyter labextension install \
         jupyter-webrtc \
         ipyvolume \
         jupyter-threejs \
         jupyterlab-execute-time \
     && \
-    python${PYTHON_VERSION} -m jupyter labextension install @ryantam626/jupyterlab_code_formatter && \
-    python${PYTHON_VERSION} -m pip --no-cache-dir install jupyterlab_code_formatter && \
-    python${PYTHON_VERSION} -m jupyter serverextension enable --sys-prefix --py jupyterlab_code_formatter && \
-    python${PYTHON_VERSION} -m pip --no-cache-dir install black isort && \
-    python${PYTHON_VERSION} -m pip --no-cache-dir install jupyterlab-git && \
-    python${PYTHON_VERSION} -m jupyter lab build
+    python${JUPYTERHUB_PYTHON_VERSION} -m jupyter labextension install @ryantam626/jupyterlab_code_formatter && \
+    python${JUPYTERHUB_PYTHON_VERSION} -m pip --no-cache-dir install jupyterlab_code_formatter && \
+    python${JUPYTERHUB_PYTHON_VERSION} -m jupyter serverextension enable --sys-prefix --py jupyterlab_code_formatter && \
+    python${JUPYTERHUB_PYTHON_VERSION} -m pip --no-cache-dir install black isort && \
+    python${JUPYTERHUB_PYTHON_VERSION} -m pip --no-cache-dir install jupyterlab-git && \
+    python${JUPYTERHUB_PYTHON_VERSION} -m jupyter lab build
 
 RUN mkdir -p ~/.venv && \
-    python${PYTHON_VERSION} -m venv ~/.venv/robofish && \
+    python${JUPYTERHUB_PYTHON_VERSION} -m venv ~/.venv/robofish && \
     . ~/.venv/robofish/bin/activate && \
-    python${PYTHON_VERSION} -m pip --no-cache-dir install --upgrade pip==20.2.2 && \
+    python${JUPYTERHUB_PYTHON_VERSION} -m pip --no-cache-dir install --upgrade pip==20.2.2 && \
     pip --no-cache-dir install --upgrade setuptools==49.1.0 && \
     pip install tensorflow==1.15.3 && \
     pip --no-cache-dir install \

jupyterhub/vim/Dockerfile

+# SPDX-License-Identifier: Apache-2.0
+FROM git.imp.fu-berlin.de:5000/bioroboticslab/robofish/docker/jupyterhub
+
+LABEL maintainer="Moritz Maxeiner <moritz.maxeiner@fu-berlin.de>"
+LABEL authors="Moritz Maxeiner <moritz.maxeiner@fu-berlin.de>"
+
+RUN python${JUPYTERHUB_PYTHON_VERSION} -m jupyter labextension install @axlair/jupyterlab_vim