diff --git a/.github/workflows/build-and-push-to-docker.yml b/.github/workflows/build-and-push-to-docker.yml index 9ef990bd..1e20ff9e 100644 --- a/.github/workflows/build-and-push-to-docker.yml +++ b/.github/workflows/build-and-push-to-docker.yml @@ -56,17 +56,21 @@ jobs: strategy: fail-fast: true matrix: - BASE_PYTHON_VERSION: - - "3.10" - - "3.9" - - "3.8" + include: + - BASE_PYTHON_VERSION: "3.11" + REGISTRY: quay.io + - BASE_PYTHON_VERSION: "3.10" + REGISTRY: docker.io + - BASE_PYTHON_VERSION: "3.9" + REGISTRY: docker.io + - BASE_PYTHON_VERSION: "3.8" + REGISTRY: docker.io steps: - name: Docker Login uses: Azure/docker-login@v1 with: username: ${{ secrets.RENKU_DOCKER_USERNAME }} password: ${{ secrets.RENKU_DOCKER_PASSWORD }} - - uses: actions/checkout@v4 - name: Set up QEMU uses: docker/setup-qemu-action@v3.0.0 @@ -348,10 +352,13 @@ jobs: strategy: fail-fast: true matrix: - EXTENSION: - - vnc - - batch - + include: + - EXTENSION: vnc + PYTHON_VERSION: "3.10" + - EXTENSION: vnc + PYTHON_VERSION: "3.11" + - EXTENSION: batch + PYTHON_VERSION: "3.10" steps: - name: Docker Login uses: Azure/docker-login@v1 @@ -390,7 +397,7 @@ jobs: tags: ${{ steps.meta.outputs.tags }} cache-from: type=gha provenance: false - + build-vnc-ext: needs: build-py-ext runs-on: ubuntu-latest diff --git a/docker/py/Dockerfile b/docker/py/Dockerfile index 962a5282..cf785db4 100644 --- a/docker/py/Dockerfile +++ b/docker/py/Dockerfile @@ -21,8 +21,8 @@ RUN python3 -m pip install --no-cache-dir -U pip && \ rm -rf "/home/${NB_USER}/.cache" # jupyter sets channel priority to strict which often causes very long error messages -RUN mamba config --system --set channel_priority flexible && \ - mamba clean --all -f -y +RUN conda config --system --set channel_priority flexible && \ + conda clean --all -f -y COPY renku-requirements/requirements.txt /tmp/renku-requirements.txt diff --git a/docker/py/requirements.txt b/docker/py/requirements.txt index 6271b968..3a917506 100644 --- a/docker/py/requirements.txt +++ b/docker/py/requirements.txt @@ -5,7 +5,7 @@ jupyter-server-proxy==4.1.2 jupyterlab-git==0.50.0 jupyterlab-system-monitor~=0.8.0 mistune>=2.0.1 # not directly required, pinned by Snyk to avoid a vulnerability -papermill~=2.5.0 +papermill~=2.6.0 requests>=2.20.0 setuptools>=65.5.1 # not directly required, pinned by Snyk to avoid a vulnerability virtualenv>=20.7.2