- prepare for novel jupyter.rwth-aachen.de - streamlined with iue-demos

.gitlab-ci.yml

@@ -4,69 +4,31 @@ services:
 
 stages:
   - build
-  - test
-  - release
 
 variables:
   GIT_SUBMODULE_STRATEGY: recursive
-  DOCKER_HOST: tcp://docker:2376 # Use TLS https://docs.gitlab.com/ee/ci/docker/using_docker_build.html#tls-enabled
   DOCKER_TLS_CERTDIR: "/certs"
-  CONTAINER_TEST_IMAGE: $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG
-  CONTAINER_RELEASE_IMAGE: $CI_REGISTRY_IMAGE:latest
+  DOCKER_HOST: tcp://docker:2376 # Use TLS https://docs.gitlab.com/ee/ci/docker/using_docker_build.html#tls-enabled
 
 before_script:
-  - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
-
-build-docker:
-  stage: build
-  script:
-    - docker pull $CONTAINER_TEST_IMAGE || true
-    - docker build --cache-from $CONTAINER_TEST_IMAGE --tag $CI_REGISTRY_IMAGE:$CI_COMMIT_SHA --tag $CONTAINER_TEST_IMAGE .
-    - docker push $CI_REGISTRY_IMAGE:$CI_COMMIT_SHA
-    - docker push $CONTAINER_TEST_IMAGE
-  only:
-    - master
-  only:
-    changes:
-      - binder/*
-      - Dockerfile
+  - echo ${CI_REGISTRY}
+  - docker login -u ${CI_REGISTRY_USER} -p ${CI_REGISTRY_PASSWORD} ${CI_REGISTRY}
+  - echo ${CI_CE_REGISTRY}
+  - docker login -u ${CI_CE_REGISTRY_USER} -p ${CI_CE_REGISTRY_TOKEN} ${CI_CE_REGISTRY}
 
 
-build-binder:
+build:
   stage: build
   script:
-    # Use Binder build API to trigger repo2docker to build image on GKE and OVH Binder Federation clusters
-    - ls
-    - apk update && apk add curl
-    - chmod +x binder/trigger_binder.sh
-    - binder/trigger_binder.sh https://mybinder.org/build/git/https%3A%2F%2Fgit.rwth-aachen.de%2FIENT%2Fgdet3-demos/master
-    - binder/trigger_binder.sh https://gke.mybinder.org/build/git/https%3A%2F%2Fgit.rwth-aachen.de%2FIENT%2Fgdet3-demos/master
-    - binder/trigger_binder.sh https://ovh.mybinder.org/build/git/https%3A%2F%2Fgit.rwth-aachen.de%2FIENT%2Fgdet3-demos/master
-    - ls
-  only:
-    - master
-
-test-docker:
-  stage: test
-  script:
-    - docker pull $CONTAINER_TEST_IMAGE
+    - docker pull ${CI_REGISTRY_IMAGE}:latest || true
+    - docker build --cache-from ${CI_REGISTRY_IMAGE}:latestci
+                   --tag ${CI_REGISTRY_IMAGE}:${CI_COMMIT_REF_SLUG}
+                   --tag ${CI_REGISTRY_IMAGE}:latest .
+    - docker push ${CI_REGISTRY_IMAGE}:${CI_COMMIT_REF_SLUG}
+    - docker push ${CI_REGISTRY_IMAGE}:latest
   only:
     - master
   only:
     changes:
       - binder/*
       - Dockerfile
-
-
-release-docker:
-  stage: release
-  script:
-    - docker pull $CONTAINER_TEST_IMAGE
-    - docker tag $CONTAINER_TEST_IMAGE $CONTAINER_RELEASE_IMAGE
-    - docker push $CONTAINER_RELEASE_IMAGE
-  only:
-    - master
-  only:
-    changes:
-      - binder/*
-      - Dockerfile
\ No newline at end of file

Dockerfile

-ARG BASE_IMAGE=registry.git.rwth-aachen.de/acs/cloud/jupyter/singleuser/python:latest
+ARG BASE_IMAGE=registry.git.rwth-aachen.de/jupyter/profiles/rwth-minimal
 FROM ${BASE_IMAGE}
 
-# update conda base environment to match specifications in environment.yml
-ADD binder/environment.yml /tmp/environment.yml
-USER root
-RUN sed -i "s|name\: gdet3lab|name\: base|g" /tmp/environment.yml # we need to replace the name of the environment with base such that we can update the base environment here
-USER $NB_USER
-RUN cat /tmp/environment.yml
-RUN conda env update -f /tmp/environment.yml
+RUN conda install --quiet --yes \
+		'scipy==1.4.1' && \
+	conda clean --all
 
-# cleanup conda packages
-RUN conda clean --all -f -y
-
-# install some extensions defined in binder postBuild
-ADD binder/postBuild /tmp/postBuild.sh
-USER root
-RUN chmod +x /tmp/postBuild.sh
-USER $NB_USER
-RUN /tmp/postBuild.sh
 
 # Copy workspace
 COPY ./ /home/jovyan

binder/environment.yml

-name: gdet3lab
+name: iuelab
 channels:
   - conda-forge
 dependencies:
-  - numpy=1.17.3
-  - scipy=1.4.1
-  - matplotlib=3.1.2
-  - jupyterlab=1.2.4
-  - nodejs=13.6.0
-  - ipympl=0.4.1
+  - numpy==1.18.1
+  - scipy==1.4.1
+  - matplotlib-base==3.1.2
+  - jupyterlab==2.0.1
+  - nodejs==13.13.0
+  - ipympl==0.5.6

binder/postBuild

-jupyter labextension install @jupyter-widgets/jupyterlab-manager@1.1 jupyter-matplotlib@0.5.0
\ No newline at end of file
+jupyter labextension install @jupyter-widgets/jupyterlab-manager@2.0.0 jupyter-matplotlib@0.7.2
\ No newline at end of file

ient_nb @ 1c0dd7b9

-Subproject commit 3a62ea0f968f191cc7073b3ed85943d34475523b
+Subproject commit 1c0dd7b9a4c6c07532e6ab3ebc605fec8838b005