From 2a8b0a016e3d4664a4ea96620a9590abc4aaec20 Mon Sep 17 00:00:00 2001 From: Peter Johnson Date: Sun, 8 Oct 2023 15:48:03 -0700 Subject: [PATCH] Update to 2024 compilers --- Makefile | 4 ++-- aarch64-cross-ubuntu/Dockerfile.bullseye | 2 +- raspbian-cross-ubuntu/Dockerfile.bullseye | 2 +- roborio-cross-ubuntu/{Dockerfile.2023 => Dockerfile.2024} | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) rename roborio-cross-ubuntu/{Dockerfile.2023 => Dockerfile.2024} (79%) diff --git a/Makefile b/Makefile index a60e443..fd8ce62 100644 --- a/Makefile +++ b/Makefile @@ -23,7 +23,7 @@ build/base: build/cross: build/base cd roborio-cross-ubuntu && \ - docker build -t ${DOCKER_USER}/roborio-cross-ubuntu:2023-${UBUNTU} -f Dockerfile.2023 --build-arg UBUNTU=${UBUNTU} . + docker build -t ${DOCKER_USER}/roborio-cross-ubuntu:2024-${UBUNTU} -f Dockerfile.2024 --build-arg UBUNTU=${UBUNTU} . cd raspbian-cross-ubuntu && \ docker build -t ${DOCKER_USER}/raspbian-cross-ubuntu:bullseye-${UBUNTU} -f Dockerfile.bullseye --build-arg UBUNTU=${UBUNTU} . cd aarch64-cross-ubuntu && \ @@ -40,7 +40,7 @@ push/base: docker push ${DOCKER_USER}/gazebo-ubuntu:${UBUNTU} push/cross: push/base - docker push ${DOCKER_USER}/roborio-cross-ubuntu:2023-${UBUNTU} + docker push ${DOCKER_USER}/roborio-cross-ubuntu:2024-${UBUNTU} docker push ${DOCKER_USER}/raspbian-cross-ubuntu:bullseye-${UBUNTU} docker push ${DOCKER_USER}/aarch64-cross-ubuntu:bullseye-${UBUNTU} diff --git a/aarch64-cross-ubuntu/Dockerfile.bullseye b/aarch64-cross-ubuntu/Dockerfile.bullseye index 4099d8b..af070d1 100644 --- a/aarch64-cross-ubuntu/Dockerfile.bullseye +++ b/aarch64-cross-ubuntu/Dockerfile.bullseye @@ -2,6 +2,6 @@ ARG UBUNTU=22.04 FROM wpilib/ubuntu-base:${UBUNTU} # Install toolchain -RUN curl -SL https://github.com/wpilibsuite/opensdk/releases/download/v2023-7/arm64-bullseye-2023-x86_64-linux-gnu-Toolchain-10.2.0.tgz | sh -c 'mkdir -p /usr/local && cd /usr/local && tar xzf - --strip-components=2' +RUN curl -SL https://github.com/wpilibsuite/opensdk/releases/download/v2024-1/arm64-bullseye-2024-x86_64-linux-gnu-Toolchain-10.2.0.tgz | sh -c 'mkdir -p /usr/local && cd /usr/local && tar xzf - --strip-components=2' WORKDIR / diff --git a/raspbian-cross-ubuntu/Dockerfile.bullseye b/raspbian-cross-ubuntu/Dockerfile.bullseye index 3fc4fca..f2028ea 100644 --- a/raspbian-cross-ubuntu/Dockerfile.bullseye +++ b/raspbian-cross-ubuntu/Dockerfile.bullseye @@ -2,6 +2,6 @@ ARG UBUNTU=22.04 FROM wpilib/ubuntu-base:${UBUNTU} # Install toolchain -RUN curl -SL https://github.com/wpilibsuite/opensdk/releases/download/v2023-7/armhf-raspi-bullseye-2023-x86_64-linux-gnu-Toolchain-10.2.0.tgz | sh -c 'mkdir -p /usr/local && cd /usr/local && tar xzf - --strip-components=2' +RUN curl -SL https://github.com/wpilibsuite/opensdk/releases/download/v2024-1/armhf-raspi-bullseye-2024-x86_64-linux-gnu-Toolchain-10.2.0.tgz | sh -c 'mkdir -p /usr/local && cd /usr/local && tar xzf - --strip-components=2' WORKDIR / diff --git a/roborio-cross-ubuntu/Dockerfile.2023 b/roborio-cross-ubuntu/Dockerfile.2024 similarity index 79% rename from roborio-cross-ubuntu/Dockerfile.2023 rename to roborio-cross-ubuntu/Dockerfile.2024 index 2a3332e..d194f2a 100644 --- a/roborio-cross-ubuntu/Dockerfile.2023 +++ b/roborio-cross-ubuntu/Dockerfile.2024 @@ -2,6 +2,6 @@ ARG UBUNTU=22.04 FROM wpilib/ubuntu-base:${UBUNTU} # Install toolchain -RUN curl -SL https://github.com/wpilibsuite/opensdk/releases/download/v2023-7/cortexa9_vfpv3-roborio-academic-2023-x86_64-linux-gnu-Toolchain-12.1.0.tgz | sh -c 'mkdir -p /usr/local && cd /usr/local && tar xzf - --strip-components=2' +RUN curl -SL https://github.com/wpilibsuite/opensdk/releases/download/v2024-1/cortexa9_vfpv3-roborio-academic-2024-x86_64-linux-gnu-Toolchain-12.1.0.tgz | sh -c 'mkdir -p /usr/local && cd /usr/local && tar xzf - --strip-components=2' WORKDIR /