Update jupyter, move to ghcr.io and simplify CI (#3)

 - Update jupyter-hub to its latest version and switch to the ":hub-" base-notebook tag: Jupyter lab will complain on version difference between jupyterlab and the base images
 - Update all the conda/pip/labextension dependencies
 - Reenable the cadquery notebook that was fixed by these updates. Still need the :master notation for cadquery though.
 - Move to ghcr.io and simplify the CI accordingly (image name = repo name)


Co-authored-by: Alex Kaszynski <[email protected]>

Author: plule-ansys

.github/workflows/ci.yaml

@@ -7,7 +7,9 @@ on:
   pull_request:
 
 env:
-  TEST_TAG: user/myapp:test
+  TEST_TAG: pyansys-base-image:test
+  REGISTRY: ghcr.io
+  IMAGE_NAME: ${{ github.repository }}
 
 jobs:
   build:
@@ -16,51 +18,51 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v2
-      - name: Read IMAGE_NAME
-        id: image_name
-        uses: falti/[email protected] 
-        with:
-          path: IMAGE_NAME
-      - name: Login to ${{ steps.image_name.outputs.registry }}
+          
+      - name: Login to ${{ env.REGISTRY }}
         uses: docker/login-action@v1
         with:
-          registry: ${{ steps.image_name.outputs.registry }}
-          username: ${{ secrets.REGISTRY_USER }}
-          password: ${{ secrets.REGISTRY_PASSWORD }}
+          registry: ${{ env.REGISTRY }}
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+          
       - name: Docker meta
         id: meta
         uses: docker/metadata-action@v3
         with:
-          images: ${{ steps.image_name.outputs.registry }}/${{ steps.image_name.outputs.repository }}
+          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
           github-token: ${{ github.token }}
+          tags: |
+            type=ref,event=branch
+            type=ref,event=pr
+            type=semver,pattern=v{{major}}.{{minor}}.{{patch}}
+            type=semver,pattern=v{{major}}.{{minor}}
+            
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v1
+        
       - name: Build and export to Docker
         uses: docker/build-push-action@v2
         with:
           context: .
           load: true
           tags: ${{ env.TEST_TAG }}
           cache-from: type=registry,ref=${{ steps.image_name.outputs.registry }}/${{ steps.image_name.outputs.repository }}:latest
+          
       - name: Test
         run: >-
           docker run --rm
           -v `pwd`/test_notebooks:/test_notebooks
           --user $(id -u):$(id -g) -e HOME=/tmp
           ${{ env.TEST_TAG }}
-          jupyter nbconvert --to html --execute $NOTEBOOKS --output-dir=/test_notebooks/out
-        env:
-          # Need fix: cadquery.ipynb
-          NOTEBOOKS: >-
-            /test_notebooks/import-all.ipynb
-            /test_notebooks/ipygany.ipynb
-            /test_notebooks/ipyvtk-simple.ipynb
-            /test_notebooks/panel.ipynb
+          jupyter nbconvert --to html --execute /test_notebooks/* --output-dir=/test_notebooks/out
+            
       - name: Save notebook HTML out
         uses: actions/upload-artifact@v2
         with:
           name: test-notebooks-html-out
           path: test_notebooks/out/*.html
+          
       - name: Push the image
         uses: docker/build-push-action@v2
         with:
@@ -70,3 +72,5 @@ jobs:
           labels: ${{ steps.meta.outputs.labels }}
           cache-from: type=registry,ref=${{ steps.image_name.outputs.registry }}/${{ steps.image_name.outputs.repository }}:latest
           cache-to: type=inline
+          secrets: |
+            "github_token=${{ steps.get_workflow_token.outputs.token }}"

Dockerfile

@@ -1,6 +1,6 @@
-FROM jupyter/base-notebook:python-3.8.8
+FROM jupyter/base-notebook:hub-1.4.2
 
-MAINTAINER Alex Kaszynski "alexander.kaszynski@ansys.com"
+MAINTAINER PyAnsys Maintainers "pyansys.maintainers@ansys.com"
 
 USER root
 

IMAGE_NAME

@@ -4,21 +4,9 @@ This repository contains a `Dockerfile` to generate the base image
 required for upstream images for pyansys.com.  Images are generated by
 pushing a git tag starting with `v`.
 
-Image is named and is built to be deployed at the MBU container
-repository, but this will be changed to be deployed via dockerhub or
-github docker
+The image is pushed to the github repository ghcr.io.
 
-```
-mapdlhelm.azurecr.io/jupyterlab_base:$VERSION
-```
-
-Obtain docker login credentials by following the steps at:
-https://portal.azure.com/#@ansys.com/resource/subscriptions/2870ae10-53f8-46b1-8971-93761377c38b/resourceGroups/PyANSYS/providers/Microsoft.ContainerRegistry/registries/mapdlhelm
-
-It can be run locally by running the scripts in the following order:
-
-- build_image.sh
-- run_image.sh
+It can be run locally with `build_and_run_image.sh`
 
 #### Notes
  - GPU image on dev.pyansys.com contains additional GPU remote

README.md

@@ -1,11 +1,13 @@
-source IMAGE_NAME
+#!/bin/bash
 
-# with GPU
-# docker run -it --rm -v /home/$USER/python:/mnt/python -v /tmp:/mnt/tmp -p 8888:8888 --gpus all $IMAGE
+IMAGE="pyansys-base-image:dev"
+
+# build the jupyter single user image
+docker build -t "$IMAGE" .
 
 # w/o GPU
 docker run -it --rm \
        -v /home/$USER/python:/mnt/python \
        -v /tmp:/mnt/tmp \
        -v `pwd`/test_notebooks:/home/jovyan/test_notebooks \
-       -p 8888:8888 $IMAGE
+       -p 8888:8888 "$IMAGE"

run_image.sh renamed to build_and_run_image.sh

@@ -4,25 +4,25 @@ channels:
   - cadquery
   - plotly
 dependencies:
-  - jupyterlab=3.0.10
-  - ipywidgets=7.6.3
-  - pandas=1.2.3
+  - jupyterlab=3.2.0
+  - ipywidgets=7.6.5
+  - pandas=1.2.4
   - ipygany=0.5.0
   - pyvista=0.32.1
-  - panel=0.11.0
-  - plotly=4.14.3
-  - cadquery=master
-  - jupyter-dash=0.3.0
-  - networkx=2.5
+  - panel=0.12.4
+  - plotly=5.3.1
+  - cadquery=master # version 2.1 does not support python 3.9
+  - jupyter-dash=0.4.0
+  - networkx=2.6.3
   - colour=0.1.5
   - cairo=1.16.0
-  - ipympl=0.6.3
-  - ipyevents=0.8.2
-  - ipycanvas=0.8.2
-  - dash-bootstrap-components=0.11.3
+  - ipympl=0.8.1
+  - ipyevents=2.0.1
+  - ipycanvas=0.9.0
+  - dash-bootstrap-components=1.0.0
   - ipyvtklink==0.2.1
-  - pip=21.2.4
+  - pip=21.3
   - pip:
-    - jupyter-cadquery==2.0.0
-    - dash-vtk==0.0.6
+    - jupyter-cadquery==2.2.1
+    - dash-vtk==0.0.9
     - dash-treeview-antd==0.0.1

build_image.sh

@@ -1,3 +1,3 @@
-jupyterlab-plotly@4.14.3
+jupyterlab-plotly@5.3.1
 [email protected]
 [email protected]