Merge pull request jupyterhub#2213 from consideRatio/pr/bump-singleus…

…er-sample-for-1.0.0-release singleuser-sample: update base image
naziric · May 19, 2021 · 4c460f8 · 4c460f8
2 parents 4c068ac + 7c9bac0
commit 4c460f8
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/.github/workflows/test-docker-build.yaml b/.github/workflows/test-docker-build.yaml
@@ -35,7 +35,11 @@ jobs:
           python-version: "3.8"
 
       - name: Install chartpress
-        run: pip install chartpress
+        run: |
+          # FIXME: six is required by docker 5.0.0 but isn't explicitly required
+          #        https://github.com/docker/docker-py/issues/2807
+          #
+          pip install chartpress six
 
       - name: Set up QEMU (for docker buildx)
         uses: docker/setup-qemu-action@c308fdd69d26ed66f4506ebd74b180abe5362145 # dependabot updates to latest release

diff --git a/images/singleuser-sample/Dockerfile b/images/singleuser-sample/Dockerfile
@@ -1,12 +1,11 @@
-FROM jupyter/base-notebook:016833b15ceb
+FROM jupyter/base-notebook:cf9a75c29789
 # Built from... https://hub.docker.com/r/jupyter/base-notebook/
 #               https://github.com/jupyter/docker-stacks/blob/master/base-notebook/Dockerfile
-# Built from... Ubuntu 18.04
+# Built from... Ubuntu 20.04
 
 # VULN_SCAN_TIME=2021-04-13_00:03:33
 
-# The jupyter/docker-stacks images contains jupyterhub, jupyterlab and the
-# jupyterlab-hub extension already.
+# The jupyter/docker-stacks images contains jupyterhub and jupyterlab already.
 
 # Example install of git and nbgitpuller.
 # NOTE: git is already available in the jupyter/minimal-notebook image.