diff --git a/.github/workflows/daily-rocker-builds.yaml b/.github/workflows/daily-rocker-builds.yaml index 7f98566..670af84 100644 --- a/.github/workflows/daily-rocker-builds.yaml +++ b/.github/workflows/daily-rocker-builds.yaml @@ -6,7 +6,7 @@ on: rver: default: "devel" biocver: - default: "3.20" + default: "3.21" check-rocker-image: default: "rocker/rstudio" schedule: @@ -21,7 +21,7 @@ jobs: id: defs run: | echo rver=$(echo ${{ github.event.inputs.rver || 'devel' }}) >> $GITHUB_OUTPUT - BIOCVER=$(echo ${{ github.event.inputs.biocver || '3.20' }}) + BIOCVER=$(echo ${{ github.event.inputs.biocver || '3.21' }}) echo "develbiocver=$BIOCVER" >> $GITHUB_OUTPUT echo check-rocker-image=$(echo ${{ github.event.inputs.check-rocker-image || 'rocker/rstudio' }}) >> $GITHUB_OUTPUT RELEASE_BIOC_VER=$(echo "${BIOCVER%.*}.$((${BIOCVER##*.}-1))") @@ -87,7 +87,7 @@ jobs: id: defs run: | echo rver=$(echo ${{ github.event.inputs.rver || 'devel' }}) >> $GITHUB_OUTPUT - echo biocver=$(echo ${{ github.event.inputs.biocver || '3.20' }}) >> $GITHUB_OUTPUT + echo biocver=$(echo ${{ github.event.inputs.biocver || '3.21' }}) >> $GITHUB_OUTPUT echo registryuser=$(echo ${{ github.repository_owner }} | awk '{print tolower($0)}') >> $GITHUB_OUTPUT echo rockerintermediateprefix=$(echo "ghcr.io/${{ github.repository_owner }}/rocker" | awk '{print tolower($0)}') >> $GITHUB_OUTPUT @@ -139,7 +139,7 @@ jobs: id: defs run: | echo rver=$(echo ${{ github.event.inputs.rver || 'devel' }}) >> $GITHUB_OUTPUT - echo biocver=$(echo ${{ github.event.inputs.biocver || '3.20' }}) >> $GITHUB_OUTPUT + echo biocver=$(echo ${{ github.event.inputs.biocver || '3.21' }}) >> $GITHUB_OUTPUT echo registryuser=$(echo ${{ github.repository_owner }} | awk '{print tolower($0)}') >> $GITHUB_OUTPUT echo rockerintermediateprefix=$(echo "ghcr.io/${{ github.repository_owner }}/rocker" | awk '{print tolower($0)}') >> $GITHUB_OUTPUT @@ -199,7 +199,7 @@ jobs: id: defs run: | echo rver=$(echo ${{ github.event.inputs.rver || 'devel' }}) >> $GITHUB_OUTPUT - echo biocver=$(echo ${{ github.event.inputs.biocver || '3.20' }}) >> $GITHUB_OUTPUT + echo biocver=$(echo ${{ github.event.inputs.biocver || '3.21' }}) >> $GITHUB_OUTPUT echo registryuser=$(echo ${{ github.repository_owner }} | awk '{print tolower($0)}') >> $GITHUB_OUTPUT echo rockerintermediateprefix=$(echo "ghcr.io/${{ github.repository_owner }}/rocker" | awk '{print tolower($0)}') >> $GITHUB_OUTPUT @@ -250,7 +250,7 @@ jobs: id: defs run: | echo rver=$(echo ${{ github.event.inputs.rver || 'devel' }}) >> $GITHUB_OUTPUT - echo biocver=$(echo ${{ github.event.inputs.biocver || '3.20' }}) >> $GITHUB_OUTPUT + echo biocver=$(echo ${{ github.event.inputs.biocver || '3.21' }}) >> $GITHUB_OUTPUT echo registryuser=$(echo ${{ github.repository_owner }} | awk '{print tolower($0)}') >> $GITHUB_OUTPUT echo rockerintermediateprefix=$(echo "ghcr.io/${{ github.repository_owner }}/rocker" | awk '{print tolower($0)}') >> $GITHUB_OUTPUT diff --git a/.github/workflows/full-rstudio-build.yml b/.github/workflows/full-rstudio-build.yml index d376eb3..3f891e5 100644 --- a/.github/workflows/full-rstudio-build.yml +++ b/.github/workflows/full-rstudio-build.yml @@ -9,7 +9,7 @@ on: rver: default: "devel" biocver: - default: "3.20" + default: "3.21" outname: default: "bioconductor_docker" schedule: @@ -61,7 +61,7 @@ jobs: run: | echo outname=$(echo ${{ github.event.inputs.outname || 'bioconductor_docker' }}) >> $GITHUB_OUTPUT echo rver=$(echo ${{ github.event.inputs.rver || 'devel' }}) >> $GITHUB_OUTPUT - echo biocver=$(echo ${{ github.event.inputs.biocver || '3.20' }}) >> $GITHUB_OUTPUT + echo biocver=$(echo ${{ github.event.inputs.biocver || '3.21' }}) >> $GITHUB_OUTPUT echo registryuser=$(echo ${{ github.repository_owner }} | awk '{print tolower($0)}') >> $GITHUB_OUTPUT echo rockerintermediateprefix=$(echo "ghcr.io/${{ github.repository_owner }}/rocker" | awk '{print tolower($0)}') >> $GITHUB_OUTPUT diff --git a/Dockerfile b/Dockerfile index 69b29b2..3e029b2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -16,7 +16,7 @@ ENV TARGETARCH=${TARGETARCH:-amd64} FROM base-$TARGETARCH AS base ## Set Dockerfile version number -ARG BIOCONDUCTOR_VERSION=3.20 +ARG BIOCONDUCTOR_VERSION=3.21 ##### IMPORTANT ######## ## The PATCH version number should be incremented each time @@ -62,7 +62,7 @@ LABEL name="bioconductor/bioconductor_docker" \ license="Artistic-2.0" # Reset args in last layer -ARG BIOCONDUCTOR_VERSION=3.20 +ARG BIOCONDUCTOR_VERSION=3.21 ARG BIOCONDUCTOR_PATCH=29 ARG BIOCONDUCTOR_DOCKER_VERSION=${BIOCONDUCTOR_VERSION}.${BIOCONDUCTOR_PATCH} diff --git a/bioc_scripts/install_bioc_sysdeps.sh b/bioc_scripts/install_bioc_sysdeps.sh index ffe1e9d..003bc6c 100644 --- a/bioc_scripts/install_bioc_sysdeps.sh +++ b/bioc_scripts/install_bioc_sysdeps.sh @@ -1,7 +1,7 @@ #!/bin/bash set -e -BIOC_VERSION=${1:-"3.20"} +BIOC_VERSION=${1:-"3.21"} # This is to avoid the error # 'debconf: unable to initialize frontend: Dialog'