Make 2027 arm cross images with JDK 21 (#55)

Use JDK 21 and 2025-2 compiler in 2027 images

Author: sciencewhiz

Makefile

@@ -33,9 +33,11 @@ build/cross: build/base
 	cd systemcore-cross-ubuntu && \
 	    docker build -t ${DOCKER_USER}/systemcore-cross-ubuntu:2027-${UBUNTU} -f Dockerfile.2027 --build-arg UBUNTU=${UBUNTU} --build-arg TYPE=base .
 	cd raspbian-cross-ubuntu && \
-	    docker build -t ${DOCKER_USER}/raspbian-cross-ubuntu:bookworm-${UBUNTU} -f Dockerfile.bookworm --build-arg UBUNTU=${UBUNTU} --build-arg TYPE=base .
+	    docker build -t ${DOCKER_USER}/raspbian-cross-ubuntu:bookworm-${UBUNTU} -f Dockerfile.bookworm-2025 --build-arg UBUNTU=${UBUNTU} --build-arg TYPE=base . && \
+	    docker build -t ${DOCKER_USER}/raspbian-cross-ubuntu:2027-bookworm-${UBUNTU} -f Dockerfile.bookworm-2027 --build-arg UBUNTU=${UBUNTU} --build-arg TYPE=base .
 	cd aarch64-cross-ubuntu && \
-	    docker build -t ${DOCKER_USER}/aarch64-cross-ubuntu:bookworm-${UBUNTU} -f Dockerfile.bookworm --build-arg UBUNTU=${UBUNTU} --build-arg TYPE=base .
+	    docker build -t ${DOCKER_USER}/aarch64-cross-ubuntu:bookworm-${UBUNTU} -f Dockerfile.bookworm-2025 --build-arg UBUNTU=${UBUNTU} --build-arg TYPE=base . && \
+	    docker build -t ${DOCKER_USER}/aarch64-cross-ubuntu:2027-bookworm-${UBUNTU} -f Dockerfile.bookworm-2027 --build-arg UBUNTU=${UBUNTU} --build-arg TYPE=base .
 
 build/minimal-base:
 	cd ubuntu-minimal-base && \
@@ -47,9 +49,9 @@ build/minimal-cross: build/minimal-base
 	cd systemcore-cross-ubuntu && \
 	    docker build -t ${DOCKER_USER}/systemcore-cross-ubuntu-minimal:2027-${UBUNTU} -f Dockerfile.2027 --build-arg UBUNTU=${UBUNTU} --build-arg TYPE=minimal-base .
 	cd raspbian-cross-ubuntu && \
-	    docker build -t ${DOCKER_USER}/raspbian-cross-ubuntu-minimal:bookworm-${UBUNTU} -f Dockerfile.bookworm --build-arg UBUNTU=${UBUNTU} --build-arg TYPE=minimal-base .
+	    docker build -t ${DOCKER_USER}/raspbian-cross-ubuntu-minimal:bookworm-${UBUNTU} -f Dockerfile.bookworm-2025 --build-arg UBUNTU=${UBUNTU} --build-arg TYPE=minimal-base .
 	cd aarch64-cross-ubuntu && \
-	    docker build -t ${DOCKER_USER}/aarch64-cross-ubuntu-minimal:bookworm-${UBUNTU} -f Dockerfile.bookworm --build-arg UBUNTU=${UBUNTU} --build-arg TYPE=minimal-base .
+	    docker build -t ${DOCKER_USER}/aarch64-cross-ubuntu-minimal:bookworm-${UBUNTU} -f Dockerfile.bookworm-2025 --build-arg UBUNTU=${UBUNTU} --build-arg TYPE=minimal-base .
 
 build/opensdk:
 	cd opensdk/ubuntu && \
@@ -68,6 +70,8 @@ push/cross: push/base
 	docker push ${DOCKER_USER}/systemcore-cross-ubuntu:2027-${UBUNTU}
 	docker push ${DOCKER_USER}/raspbian-cross-ubuntu:bookworm-${UBUNTU}
 	docker push ${DOCKER_USER}/aarch64-cross-ubuntu:bookworm-${UBUNTU}
+	docker push ${DOCKER_USER}/raspbian-cross-ubuntu:2027-bookworm-${UBUNTU}
+	docker push ${DOCKER_USER}/aarch64-cross-ubuntu:2027-bookworm-${UBUNTU}
 
 push/minimal-base:
 	docker push ${DOCKER_USER}/ubuntu-minimal-base:${UBUNTU}

aarch64-cross-ubuntu/Dockerfile.bookworm renamed to aarch64-cross-ubuntu/Dockerfile.bookworm-2025

@@ -0,0 +1,12 @@
+ARG UBUNTU=24.04
+ARG TYPE=base
+FROM wpilib/ubuntu-${TYPE}:${UBUNTU}
+
+# Install toolchain
+RUN curl -SL https://github.com/wpilibsuite/opensdk/releases/download/v2025-2/arm64-bookworm-2025-x86_64-linux-gnu-Toolchain-12.2.0.tgz | sh -c 'mkdir -p /usr/local && cd /usr/local && tar xzf - --strip-components=2'
+
+RUN apt update && apt install -y openjdk-21-jdk && rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME /usr/lib/jvm/java-21-openjdk-amd64
+
+WORKDIR /

aarch64-cross-ubuntu/Dockerfile.bookworm-2027

@@ -0,0 +1,13 @@
+ARG UBUNTU=24.04
+ARG TYPE=base
+FROM wpilib/ubuntu-${TYPE}:${UBUNTU}
+
+
+# Install toolchain
+RUN curl -SL https://github.com/wpilibsuite/opensdk/releases/download/v2025-2/armhf-raspi-bookworm-2025-x86_64-linux-gnu-Toolchain-12.2.0.tgz | sh -c 'mkdir -p /usr/local && cd /usr/local && tar xzf - --strip-components=2'
+
+RUN apt update && apt install -y openjdk-21-jdk && rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME /usr/lib/jvm/java-21-openjdk-amd64
+
+WORKDIR /