Skip to content

Commit a52cf9c

Browse files
committed
Move devel to 3.22
1 parent ecdc240 commit a52cf9c

File tree

2 files changed

+20
-20
lines changed

2 files changed

+20
-20
lines changed

.github/workflows/build_containers.yaml

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,13 @@ jobs:
1515
fail-fast: false
1616
matrix:
1717
base:
18-
- {image: 'ghcr.io/bioconductor/rocker-r-ver', amdtag: 'devel-amd64', outname: 'r-ver'}
19-
- {image: 'ghcr.io/bioconductor/rocker-rstudio', amdtag: 'devel-amd64', outname: 'bioconductor_docker'}
20-
- {image: 'rocker/tidyverse', amdtag: 'devel', outname: 'tidyverse'}
21-
- {image: 'ghcr.io/bioconductor/rocker-cuda', amdtag: 'devel-amd64', outname: 'cuda'}
22-
- {image: 'ghcr.io/bioconductor/rocker-ml', amdtag: 'devel-amd64', outname: 'ml'}
23-
- {image: 'ghcr.io/bioconductor/rocker-ml-verse', amdtag: 'devel-amd64', outname: 'ml-verse'}
24-
- {image: 'rocker/shiny', amdtag: 'latest', outname: 'shiny'}
18+
- {image: 'rocker/r-ver', amdtag: '4.5.0', outname: 'r-ver'}
19+
- {image: 'rocker/rstudio', amdtag: '4.5.0', outname: 'bioconductor_docker'}
20+
- {image: 'rocker/tidyverse', amdtag: '4.5.0', outname: 'tidyverse'}
21+
# - {image: 'ghcr.io/bioconductor/rocker-cuda', amdtag: 'devel-amd64', outname: 'cuda'}
22+
# - {image: 'ghcr.io/bioconductor/rocker-ml', amdtag: 'devel-amd64', outname: 'ml'}
23+
# - {image: 'ghcr.io/bioconductor/rocker-ml-verse', amdtag: 'devel-amd64', outname: 'ml-verse'}
24+
- {image: 'rocker/shiny', amdtag: '4.5.0', outname: 'shiny'}
2525
steps:
2626
- uses: actions/checkout@v4
2727

@@ -94,8 +94,8 @@ jobs:
9494
fail-fast: false
9595
matrix:
9696
base:
97-
- {image: 'ghcr.io/bioconductor/rocker-r-ver', armtag: 'devel-arm64', outname: 'r-ver'}
98-
- {image: 'ghcr.io/bioconductor/rocker-rstudio', armtag: 'devel-arm64', outname: 'bioconductor_docker'}
97+
- {image: 'rocker/r-ver', armtag: '4.5.0', outname: 'r-ver'}
98+
- {image: 'rocker/rstudio', armtag: '4.5.0', outname: 'bioconductor_docker'}
9999
steps:
100100
- uses: actions/checkout@v3
101101

@@ -170,13 +170,13 @@ jobs:
170170
fail-fast: false
171171
matrix:
172172
base:
173-
- {image: 'ghcr.io/bioconductor/rocker-r-ver', amdtag: 'devel-amd64', outname: 'r-ver', platforms: 'amd64,arm64'}
174-
- {image: 'ghcr.io/bioconductor/rocker-rstudio', amdtag: 'devel-amd64', outname: 'bioconductor_docker', platforms: 'amd64,arm64'}
175-
- {image: 'rocker/tidyverse', amdtag: 'devel', outname: 'tidyverse', platforms: 'amd64'}
176-
- {image: 'ghcr.io/bioconductor/rocker-cuda', amdtag: 'devel-amd64', outname: 'cuda', platforms: 'amd64'}
177-
- {image: 'ghcr.io/bioconductor/rocker-ml', amdtag: 'devel-amd64', outname: 'ml', platforms: 'amd64'}
178-
- {image: 'ghcr.io/bioconductor/rocker-ml-verse', amdtag: 'devel-amd64', outname: 'ml-verse', platforms: 'amd64'}
179-
- {image: 'rocker/shiny', amdtag: 'latest', outname: 'shiny', platforms: 'amd64'}
173+
- {image: 'rocker/r-ver', amdtag: '4.5.0', outname: 'r-ver', platforms: 'amd64,arm64'}
174+
- {image: 'rocker/rstudio', amdtag: '4.5.0', outname: 'bioconductor_docker', platforms: 'amd64,arm64'}
175+
- {image: 'rocker/tidyverse', amdtag: '4.5.0', outname: 'tidyverse', platforms: 'amd64'}
176+
#- {image: 'ghcr.io/bioconductor/rocker-cuda', amdtag: 'devel-amd64', outname: 'cuda', platforms: 'amd64'}
177+
#- {image: 'ghcr.io/bioconductor/rocker-ml', amdtag: 'devel-amd64', outname: 'ml', platforms: 'amd64'}
178+
#- {image: 'ghcr.io/bioconductor/rocker-ml-verse', amdtag: 'devel-amd64', outname: 'ml-verse', platforms: 'amd64'}
179+
- {image: 'rocker/shiny', amdtag: '4.5.0', outname: 'shiny', platforms: 'amd64'}
180180
steps:
181181
- name: Set up Docker Buildx
182182
uses: docker/setup-buildx-action@v3

Dockerfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,12 @@ ENV TARGETARCH=${TARGETARCH:-amd64}
1616
FROM base-$TARGETARCH AS base
1717

1818
## Set Dockerfile version number
19-
ARG BIOCONDUCTOR_VERSION=3.21
19+
ARG BIOCONDUCTOR_VERSION=3.22
2020

2121
##### IMPORTANT ########
2222
## The PATCH version number should be incremented each time
2323
## there is a change in the Dockerfile.
24-
ARG BIOCONDUCTOR_PATCH=21
24+
ARG BIOCONDUCTOR_PATCH=0
2525

2626
ARG BIOCONDUCTOR_DOCKER_VERSION=${BIOCONDUCTOR_VERSION}.${BIOCONDUCTOR_PATCH}
2727

@@ -61,8 +61,8 @@ LABEL name="bioconductor/bioconductor_docker" \
6161
license="Artistic-2.0"
6262

6363
# Reset args in last layer
64-
ARG BIOCONDUCTOR_VERSION=3.21
65-
ARG BIOCONDUCTOR_PATCH=21
64+
ARG BIOCONDUCTOR_VERSION=3.22
65+
ARG BIOCONDUCTOR_PATCH=0
6666
ARG BIOCONDUCTOR_DOCKER_VERSION=${BIOCONDUCTOR_VERSION}.${BIOCONDUCTOR_PATCH}
6767

6868
# Set automatically when building with --platform

0 commit comments

Comments
 (0)