chore: library upgrade #251
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -24,7 +24,7 @@ jobs: | |||||
| - docker/qgis/Dockerfile | ||||||
| runs-on: ubuntu-latest | ||||||
| steps: | ||||||
| - uses: actions/checkout@v2 | ||||||
| - uses: hadolint/[email protected] | ||||||
| with: | ||||||
| dockerfile: ${{ matrix.DOCKERFILE_PATH }} | ||||||
|
|
@@ -38,8 +38,8 @@ jobs: | |||||
| fail-fast: true | ||||||
| matrix: | ||||||
| BASE_IMAGE_TAG: | ||||||
| - lab-3.4.0 | ||||||
| - python-3.9.12 | ||||||
| - python-3.8.8 | ||||||
| - python-3.7.6 | ||||||
|
|
||||||
|
|
@@ -62,7 +62,7 @@ jobs: | |||||
|
|
||||||
| # This ensures the same image tags as before are built, in addition to new ones | ||||||
| if [[ "${{ matrix.BASE_IMAGE_TAG }}" == lab-* ]]; then | ||||||
| export LABEL_PREFIX=3.10 | ||||||
| else | ||||||
| export LABEL_PREFIX=${{ matrix.BASE_IMAGE_TAG }} | ||||||
| fi | ||||||
|
|
@@ -114,7 +114,7 @@ jobs: | |||||
| fi | ||||||
|
|
||||||
| docker build docker/$EXTENSION \ | ||||||
| --build-arg BASE_IMAGE="$DOCKER_NAME-py:3.10-$LABEL" \ | ||||||
|
There was a problem hiding this comment.
Suggested change
|
||||||
| --tag $DOCKER_NAME-$EXTENSION:$LABEL | ||||||
| docker push $DOCKER_NAME-$EXTENSION:$LABEL | ||||||
| env: | ||||||
|
|
@@ -142,25 +142,25 @@ jobs: | |||||
| CUDA_COMPAT_PACKAGE: "cuda-compat-11-1" | ||||||
| LIBCUDNN_PACKAGE: "libcudnn8=8.0.5.39-1+cuda11.1" | ||||||
| - CUDA_VERSION: "11.2" | ||||||
| PYTHON_VERSION: "3.9.12" | ||||||
| EXTRA_LIBRARIES: "" | ||||||
| CUDA_CUDART_PACKAGE: "cuda-cudart-11-2=11.2.152-1" | ||||||
| CUDA_COMPAT_PACKAGE: "cuda-compat-11-2" | ||||||
| LIBCUDNN_PACKAGE: "libcudnn8=8.1.1.33-1+cuda11.2" | ||||||
| - CUDA_VERSION: "11.3" | ||||||
| PYTHON_VERSION: "3.9.12" | ||||||
| EXTRA_LIBRARIES: "" | ||||||
| CUDA_CUDART_PACKAGE: "cuda-cudart-11-3=11.3.109-1" | ||||||
| CUDA_COMPAT_PACKAGE: "cuda-compat-11-3" | ||||||
| LIBCUDNN_PACKAGE: "libcudnn8=8.2.1.32-1+cuda11.3" | ||||||
| - CUDA_VERSION: "11.4" | ||||||
| PYTHON_VERSION: "3.9.12" | ||||||
| EXTRA_LIBRARIES: "" | ||||||
| CUDA_CUDART_PACKAGE: "cuda-cudart-11-4=11.4.148-1" | ||||||
| CUDA_COMPAT_PACKAGE: "cuda-compat-11-4" | ||||||
| LIBCUDNN_PACKAGE: "libcudnn8=8.2.4.15-1+cuda11.4" | ||||||
| - CUDA_VERSION: "11.5" | ||||||
| PYTHON_VERSION: "3.9.12" | ||||||
| EXTRA_LIBRARIES: "" | ||||||
| CUDA_CUDART_PACKAGE: "cuda-cudart-11-5=11.5.117-1" | ||||||
| CUDA_COMPAT_PACKAGE: "cuda-compat-11-5" | ||||||
|
|
@@ -298,7 +298,7 @@ jobs: | |||||
| env: | ||||||
| EXTENSION: ${{ matrix.VNC-EXTENSIONS }} | ||||||
| DOCKER_NAME: "renku/renkulab" | ||||||
|
|
||||||
| build-py-batch: | ||||||
| needs: build-py | ||||||
| runs-on: ubuntu-latest | ||||||
|
|
@@ -320,8 +320,8 @@ jobs: | |||||
| fi | ||||||
|
|
||||||
| docker build docker/batch \ | ||||||
| --build-arg RENKU_BASE="$DOCKER_NAME-py:3.10-$LABEL" \ | ||||||
|
There was a problem hiding this comment.
Suggested change
|
||||||
| --build-arg BASE_IMAGE="python:3.10-slim-buster" \ | ||||||
|
There was a problem hiding this comment.
Suggested change
|
||||||
| --tag $DOCKER_NAME-batch:$LABEL | ||||||
| docker push $DOCKER_NAME-batch:$LABEL | ||||||
| env: | ||||||
|
|
@@ -356,7 +356,7 @@ jobs: | |||||
|
|
||||||
| export DOCKER_TAG="${{ matrix.JULIAVERSIONS }}-$LABEL" | ||||||
| docker build docker/julia \ | ||||||
| --build-arg BASE_IMAGE="$DOCKER_NAME-py:3.10-$LABEL" \ | ||||||
|
There was a problem hiding this comment.
Suggested change
|
||||||
| --tag $DOCKER_NAME-julia:$DOCKER_TAG | ||||||
| echo "::set-output name=IMAGE_NAME::$DOCKER_NAME-julia:$DOCKER_TAG" | ||||||
| - name: Image Acceptance Tests | ||||||
|
|
@@ -408,11 +408,11 @@ jobs: | |||||
|
|
||||||
| export DOCKER_TAG="${{ matrix.RVERSION }}-$LABEL" | ||||||
| docker build docker/r \ | ||||||
| --build-arg RENKU_BASE="$DOCKER_NAME-py:3.10-$LABEL" \ | ||||||
|
There was a problem hiding this comment.
Suggested change
|
||||||
| --build-arg BASE_IMAGE="rocker/verse:${{ matrix.RVERSION }}" \ | ||||||
| --build-arg RSTUDIO_VERSION_OVERRIDE="${{ matrix.RSTUDIO_VERSION }}" \ | ||||||
| --tag $DOCKER_NAME-r:$DOCKER_TAG | ||||||
|
|
||||||
| echo "::set-output name=IMAGE_NAME::$DOCKER_NAME-r:$DOCKER_TAG" | ||||||
| - name: Image Acceptance Tests | ||||||
| uses: cypress-io/github-action@v2 | ||||||
|
|
@@ -462,7 +462,7 @@ jobs: | |||||
|
|
||||||
| export DOCKER_TAG="${{ matrix.RELEASE }}-$LABEL" | ||||||
| docker build docker/r \ | ||||||
| --build-arg RENKU_BASE="$DOCKER_NAME-py:3.10-$LABEL" \ | ||||||
|
There was a problem hiding this comment.
Suggested change
|
||||||
| --build-arg BASE_IMAGE=bioconductor/bioconductor_docker:${{ matrix.RELEASE }} \ | ||||||
| --tag $DOCKER_NAME-bioc:$DOCKER_TAG | ||||||
| docker push $DOCKER_NAME-bioc:$DOCKER_TAG | ||||||
|
|
||||||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,5 @@ | ||
| ARG BASE_IMAGE=jupyter/base-notebook:lab-3.4.0 | ||
| ARG RENKU_VERSION=1.6.0 | ||
| FROM $BASE_IMAGE as base | ||
|
|
||
| LABEL maintainer="Swiss Data Science Center <[email protected]>" | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,10 +1,8 @@ | ||
| jupyter-server-proxy==3.2.1 | ||
| jupyterlab-git==0.37.1 | ||
| jupyterlab-system-monitor~=0.8.0 | ||
| papermill~=2.3.0 | ||
| powerline-shell~=0.7.0 | ||
| requests>=2.20.0 | ||
| virtualenv>=20.7.2 | ||
| mistune>=2.0.1 # not directly required, pinned by Snyk to avoid a vulnerability |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@rokroskar I thought none of the images are using python 3.10. And from Ralf's comment it seems we are not ready for 3.10 yet.
So this should then probably be rolled back to 3.9?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.