docker: bump base image (#1791)

* fix permissions

* docker: bump base image

* tests: unpin numpy, python

.github/workflows/build.yml

@@ -50,7 +50,7 @@ jobs:
       run: |
         envname="${GITHUB_REPOSITORY##*/}-${GITHUB_RUN_ID}.${GITHUB_RUN_NUMBER}"
         echo "envname=$envname" >> $GITHUB_OUTPUT
-        sed -ri -e 's/^(name: ).*/\1$envname/' -e '/ python=/d' -e 's/(.* numpy=).*/\1${{ matrix.numpy-version }}/' scripts/requirements-test.yml
+        sed -ri -e 's/^(name: ).*/\1$envname/' -e '/ python /d' -e 's/(.* numpy) .*/\1=${{ matrix.numpy-version }}/' scripts/requirements-test.yml
     - uses: conda-incubator/setup-miniconda@v3
       with:
         python-version: ${{ matrix.python-version }}
@@ -88,7 +88,7 @@ jobs:
     - uses: actions/checkout@v4
       with: {fetch-depth: 0, submodules: recursive}
     - name: set requirements
-      run: sed -ri -e '/ python=/d' -e 's/(.* numpy=).*/\1${{ matrix.numpy-version }}/' -e 's/=cuda*//' -e '/tigre/d' scripts/requirements-test.yml
+      run: sed -ri -e '/ python /d' -e 's/(.* numpy) .*/\1=${{ matrix.numpy-version }}/' -e 's/=cuda*//' -e '/tigre/d' scripts/requirements-test.yml
     - uses: conda-incubator/setup-miniconda@v3
       with:
         python-version: ${{ matrix.python-version }}

Dockerfile

@@ -2,10 +2,8 @@
 # - https://github.com/jupyter/docker-stacks
 # - https://github.com/TomographicImaging/CIL#installation-of-cil
 # consumers:
-# - https://github.com/stfc/cloud-docker-images
-# TODO: use `ubuntu-22.04` after `python=3.11` is supported, vis.
-# https://github.com/TomographicImaging/CIL/issues/1490
-FROM jupyter/tensorflow-notebook:ubuntu-20.04
+# - harbor.stfc.ac.uk/imaging-tomography/cil
+FROM jupyter/tensorflow-notebook:ubuntu-22.04
 LABEL org.opencontainers.image.source=https://github.com/TomographicImaging/CIL
 # tigre: BSD-3-Clause, astra-toolbox: GPL-3.0
 LABEL org.opencontainers.image.licenses="Apache-2.0 AND BSD-3-Clause AND GPL-3.0"
@@ -17,7 +15,7 @@ ARG CIL_EXTRA_PACKAGES="tigre=2.6 astra-toolbox=2.1.0=cuda*"
 # vis. https://github.com/TomographicImaging/CIL/pull/1590
 COPY --chown="${NB_USER}" scripts/requirements-test.yml environment.yml
 # channel_priority: https://stackoverflow.com/q/58555389
-RUN sed -ri '/tigre|astra-toolbox/d' environment.yml \
+RUN sed -ri '/tigre|astra-toolbox| python /d' environment.yml \
   && for pkg in 'jupyter-server-proxy>4.1.0' $CIL_EXTRA_PACKAGES; do echo "  - $pkg" >> environment.yml; done \
   && conda config --env --set channel_priority strict \
   && for ch in defaults nvidia ccpi intel conda-forge; do conda config --env --add channels $ch; done \

scripts/requirements-test.yml

@@ -18,8 +18,8 @@ channels:
   - defaults
 dependencies:
   # base (vis. recipe/conda_build_config.yaml)
-  - python=3.10
-  - numpy=1.24
+  - python >=3.10
+  - numpy >=1.23
   - ccpi::cil-data
   - ccpi::tigre=2.6
   - ccpi::ccpi-regulariser=24.0.0