Skip to content

Commit db49717

Browse files
committed
Nightly: use Alpine 3.22 on aarch64
Otherwise the build fails because r-hub/r-minimal is Alpine 3.22 now.
1 parent 3dc045b commit db49717

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

tools/build/linux/Dockerfile-cross-aarch64

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@
1515
# TODO: make the arch a build arg, so it is easy to create cross compilers
1616
# for other architectures.
1717

18-
# We use Alpine 3.19, because that's what r-minimal uses currently.
18+
# We use Alpine 3.22, because that's what r-minimal uses currently.
1919
# When we update r-minimal, this image needs an update as well.
2020
# (We could probably use some r-minimal image as the base image, that's
2121
# slightly larger, but then we don't need to manually match versions.)
22-
FROM alpine:3.19 AS build
22+
FROM alpine:3.22 AS build
2323

2424
RUN apk add alpine-sdk sudo git
2525

@@ -35,7 +35,7 @@ WORKDIR /home/csardi
3535
# /home/csardi/sysroot-aarch64 but gcc commands have command line
3636
# options to change that.
3737
RUN abuild-keygen -a -i -n
38-
RUN git clone -b 3.19-stable https://github.com/alpinelinux/aports --depth 1
38+
RUN git clone -b 3.22-stable https://github.com/alpinelinux/aports --depth 1
3939

4040
# We don't want to build the whole small Alpine system that is the default
4141
# in `bootstreap.sh`, so we bail out before. We just need a fully
@@ -52,7 +52,7 @@ RUN CBUILDROOT=~/sysroot-$BARCH ~/aports/scripts/bootstrap.sh $BARCH
5252
# host system, anyway, as ultimately we'll use r-minimal as base, not
5353
# this image. So we might as well do that for the cross packages as well.)
5454

55-
FROM alpine:3.19
55+
FROM alpine:3.22
5656
USER root
5757
WORKDIR /root
5858
COPY --from=build /home/csardi/packages /root/packages

tools/build/linux/Dockerfile-libs-aarch64

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
FROM ghcr.io/r-lib/pak-cross-aarch64:latest AS cross
1515

16-
FROM alpine:3.19 AS build
16+
FROM alpine:3.22 AS build
1717
USER root
1818
WORKDIR /root
1919

@@ -104,7 +104,7 @@ RUN cd curl-* && \
104104

105105
# TODO: create a multi-arch pak-libs image
106106

107-
FROM --platform=linux/arm64 alpine:3.19
107+
FROM --platform=linux/arm64 alpine:3.22
108108
COPY --from=build /usr/local /usr/local/
109109

110110
# Some of this info is shown on the GH packages pages

tools/build/linux/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
# ------------------------------------------------------------------------
1414

15-
RVERSIONS ?= 3.5 3.6 4.0 4.1 4.2 4.3 4.4
15+
RVERSIONS ?= 3.5 3.6 4.0 4.1 4.2 4.3 4.4 4.5 4.6
1616
PAKVERSION=$(shell grep "^Version:" ../../../DESCRIPTION | tr -cd '0-9.')
1717
DONE=$(patsubst %,R-%.done,$(RVERSIONS))
1818
DONE_AARCH64=$(patsubst %,R-%-aarch64.done,$(RVERSIONS))

0 commit comments

Comments
 (0)