Skip to content

Commit 5a8696c

Browse files
eitsupiclaude
andauthored
feat: enable linux/arm64 builds for rocker/geospatial (#989)
Co-authored-by: Claude Sonnet 4.6 <noreply@anthropic.com>
2 parents c0ab9c6 + 10b6ae6 commit 5a8696c

13 files changed

+29
-42
lines changed

.checkov.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
skip-check:
2+
- CKV_DOCKER_2 # HEALTHCHECK not applicable for interactive dev containers
3+
- CKV_DOCKER_3 # USER not set intentionally; rocker images run as root by design
4+
- CKV_DOCKER_7 # "latest" tag used intentionally in devel/experimental images

.jscpd.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
],
66
"ignore": [
77
"**/bakefiles/*.json",
8-
"**/dockerfiles/*.json",
8+
"**/dockerfiles/**",
99
"**/templates/*"
1010
],
1111
"absolute": true

NEWS.md

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,22 @@
11
# News
22

3+
## 2026-03
4+
5+
### Breaking changes
6+
7+
- `rocker/geospatial` no longer inherits from `rocker/verse`; it now builds on `rocker/tidyverse`.
8+
TeX Live and publishing packages (`bookdown`, `rticles`, etc.) are no longer included.
9+
Use `rocker/verse` or add `install_verse.sh` in a downstream image if LaTeX is needed.
10+
([#989](https://github.com/rocker-org/rocker-versioned2/pull/989))
11+
12+
### Changes in pre-built images
13+
14+
- `rocker/geospatial` now publishes `linux/arm64` images in addition to `linux/amd64`.
15+
([#989](https://github.com/rocker-org/rocker-versioned2/pull/989))
16+
- Archived CRAN packages (`RandomFields`, `rgdal`, `rgeos`, `maptools`) removed from `install_geospatial.sh`;
17+
they have been superseded by `sf` and `terra`.
18+
([#989](https://github.com/rocker-org/rocker-versioned2/pull/989))
19+
320
## 2025-02
421

522
### Changes in pre-built images

bakefiles/4.4.3.docker-bake.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,8 @@
252252
"org.opencontainers.image.authors": "Carl Boettiger <cboettig@ropensci.org>"
253253
},
254254
"platforms": [
255-
"linux/amd64"
255+
"linux/amd64",
256+
"linux/arm64"
256257
],
257258
"cache-to": [
258259
"type=inline"

bakefiles/4.5.2.docker-bake.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,8 @@
189189
"org.opencontainers.image.authors": "Carl Boettiger <cboettig@ropensci.org>"
190190
},
191191
"platforms": [
192-
"linux/amd64"
192+
"linux/amd64",
193+
"linux/arm64"
193194
],
194195
"cache-to": [
195196
"type=inline"

bakefiles/4.5.3.docker-bake.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -381,7 +381,8 @@
381381
"org.opencontainers.image.authors": "Carl Boettiger <cboettig@ropensci.org>"
382382
},
383383
"platforms": [
384-
"linux/amd64"
384+
"linux/amd64",
385+
"linux/arm64"
385386
],
386387
"cache-to": [
387388
"type=inline"

build/templates/bakefiles/main.docker-bake.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@
6969
"org.opencontainers.image.base.name": "docker.io/library/ubuntu:{{ubuntu_series}}",
7070
"org.opencontainers.image.version": "R-{{r_version}}"
7171
},
72-
"platforms": ["linux/amd64"],
72+
"platforms": ["linux/amd64", "linux/arm64"],
7373
"cache-to": ["type=inline"]
7474
},
7575
"shiny": {

build/templates/dockerfiles/geospatial.Dockerfile.txt

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -45,13 +45,6 @@ RUN /rocker_scripts/install_pandoc.sh
4545
COPY scripts/install_quarto.sh /rocker_scripts/install_quarto.sh
4646
RUN /rocker_scripts/install_quarto.sh
4747

48-
ENV CTAN_REPO="{{ctan}}"
49-
ENV PATH="$PATH:/usr/local/texlive/bin/linux"
50-
51-
COPY scripts/install_verse.sh /rocker_scripts/install_verse.sh
52-
COPY scripts/install_texlive.sh /rocker_scripts/install_texlive.sh
53-
RUN /rocker_scripts/install_verse.sh
54-
5548
COPY scripts/install_geospatial.sh /rocker_scripts/install_geospatial.sh
5649
RUN /rocker_scripts/install_geospatial.sh
5750

dockerfiles/geospatial_4.4.3.Dockerfile

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -45,12 +45,6 @@ RUN /rocker_scripts/install_pandoc.sh
4545
COPY scripts/install_quarto.sh /rocker_scripts/install_quarto.sh
4646
RUN /rocker_scripts/install_quarto.sh
4747

48-
ENV CTAN_REPO="https://www.texlive.info/tlnet-archive/2025/04/10/tlnet"
49-
ENV PATH="$PATH:/usr/local/texlive/bin/linux"
50-
51-
COPY scripts/install_verse.sh /rocker_scripts/install_verse.sh
52-
COPY scripts/install_texlive.sh /rocker_scripts/install_texlive.sh
53-
RUN /rocker_scripts/install_verse.sh
5448

5549
COPY scripts/install_geospatial.sh /rocker_scripts/install_geospatial.sh
5650
RUN /rocker_scripts/install_geospatial.sh

dockerfiles/geospatial_4.5.2.Dockerfile

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -45,13 +45,6 @@ RUN /rocker_scripts/install_pandoc.sh
4545
COPY scripts/install_quarto.sh /rocker_scripts/install_quarto.sh
4646
RUN /rocker_scripts/install_quarto.sh
4747

48-
ENV CTAN_REPO="https://www.texlive.info/tlnet-archive/2026/03/10/tlnet"
49-
ENV PATH="$PATH:/usr/local/texlive/bin/linux"
50-
51-
COPY scripts/install_verse.sh /rocker_scripts/install_verse.sh
52-
COPY scripts/install_texlive.sh /rocker_scripts/install_texlive.sh
53-
RUN /rocker_scripts/install_verse.sh
54-
5548
COPY scripts/install_geospatial.sh /rocker_scripts/install_geospatial.sh
5649
RUN /rocker_scripts/install_geospatial.sh
5750

0 commit comments

Comments
 (0)