From 15d15cab922bea3212e9b2f49d45fdcd6c441d06 Mon Sep 17 00:00:00 2001 From: Dustin Spicuzza Date: Sun, 7 Sep 2025 23:12:14 -0400 Subject: [PATCH] Actually set UBUNTU argument in dockerfile --- cross-ubuntu-py/Dockerfile.py311 | 8 ++++---- cross-ubuntu-py/Dockerfile.py312 | 8 ++++---- cross-ubuntu-py/Dockerfile.py313 | 8 ++++---- cross-ubuntu-py/py.mk | 5 +++++ 4 files changed, 17 insertions(+), 12 deletions(-) diff --git a/cross-ubuntu-py/Dockerfile.py311 b/cross-ubuntu-py/Dockerfile.py311 index 33e6e8f..ad72a96 100644 --- a/cross-ubuntu-py/Dockerfile.py311 +++ b/cross-ubuntu-py/Dockerfile.py311 @@ -1,5 +1,5 @@ -ARG UBUNTU=22.04 +ARG UBUNTU=invalid-ubuntu ARG ARCH=invalid-arch ARG VERSION=invalid-version @@ -26,7 +26,7 @@ ENV PREFIX="$INSTALL_DIRECTORY" RUN set -xe; \ apt-get update; \ - apt-get install -y build-essential checkinstall g++ libreadline-dev libncursesw5-dev libssl-dev \ + apt-get install -y build-essential checkinstall g++ libreadline-dev libncurses-dev libssl-dev \ libsqlite3-dev tk-dev libgdbm-dev libc6-dev libbz2-dev liblzma-dev lzma-dev libffi-dev zlib1g-dev; \ # cleanup rm -rf /var/lib/apt/lists/* @@ -79,8 +79,8 @@ FROM wpilib/${ARCH}-cross-ubuntu-minimal:${VERSION}-${UBUNTU} AS crossenv RUN set -xe; \ apt-get update; \ apt-get install -y \ - binutils libreadline8 libncursesw5 libssl3 \ - libsqlite3-0 libgdbm6 libbz2-1.0 liblzma5 libffi7 zlib1g; \ + binutils libreadline8 libncursesw6 libssl3 \ + libsqlite3-0 libgdbm6 libbz2-1.0 liblzma5 libffi8 zlib1g; \ rm -rf /var/lib/apt/lists/* COPY --from=pycompile /usr/local /usr/local diff --git a/cross-ubuntu-py/Dockerfile.py312 b/cross-ubuntu-py/Dockerfile.py312 index 4fbf530..e22af06 100644 --- a/cross-ubuntu-py/Dockerfile.py312 +++ b/cross-ubuntu-py/Dockerfile.py312 @@ -1,5 +1,5 @@ -ARG UBUNTU=22.04 +ARG UBUNTU=invalid-ubuntu ARG ARCH=invalid-arch ARG VERSION=invalid-version @@ -26,7 +26,7 @@ ENV PREFIX="$INSTALL_DIRECTORY" RUN set -xe; \ apt-get update; \ - apt-get install -y build-essential checkinstall g++ libreadline-dev libncursesw5-dev libssl-dev \ + apt-get install -y build-essential checkinstall g++ libreadline-dev libncurses-dev libssl-dev \ libsqlite3-dev tk-dev libgdbm-dev libc6-dev libbz2-dev liblzma-dev lzma-dev libffi-dev zlib1g-dev; \ # cleanup rm -rf /var/lib/apt/lists/* @@ -84,8 +84,8 @@ FROM wpilib/${ARCH}-cross-ubuntu-minimal:${VERSION}-${UBUNTU} AS crossenv RUN set -xe; \ apt-get update; \ apt-get install -y \ - binutils libreadline8 libncursesw5 libssl3 \ - libsqlite3-0 libgdbm6 libbz2-1.0 liblzma5 libffi7 zlib1g; \ + binutils libreadline8 libncursesw6 libssl3 \ + libsqlite3-0 libgdbm6 libbz2-1.0 liblzma5 libffi8 zlib1g; \ rm -rf /var/lib/apt/lists/* COPY --from=pycompile /usr/local /usr/local diff --git a/cross-ubuntu-py/Dockerfile.py313 b/cross-ubuntu-py/Dockerfile.py313 index c965f32..931bd7c 100644 --- a/cross-ubuntu-py/Dockerfile.py313 +++ b/cross-ubuntu-py/Dockerfile.py313 @@ -1,5 +1,5 @@ -ARG UBUNTU=22.04 +ARG UBUNTU=invalid-ubuntu ARG ARCH=invalid-arch ARG VERSION=invalid-version @@ -28,7 +28,7 @@ ENV PREFIX="$INSTALL_DIRECTORY" RUN set -xe; \ apt-get update; \ - apt-get install -y build-essential checkinstall g++ libreadline-dev libncursesw5-dev libssl-dev \ + apt-get install -y build-essential checkinstall g++ libreadline-dev libncurses-dev libssl-dev \ libsqlite3-dev tk-dev libgdbm-dev libc6-dev libbz2-dev liblzma-dev lzma-dev libffi-dev zlib1g-dev; \ # cleanup rm -rf /var/lib/apt/lists/* @@ -86,8 +86,8 @@ FROM wpilib/${ARCH}-cross-ubuntu-minimal:${VERSION}-${UBUNTU} AS crossenv RUN set -xe; \ apt-get update; \ apt-get install -y \ - binutils libreadline8 libncursesw5 libssl3 \ - libsqlite3-0 libgdbm6 libbz2-1.0 liblzma5 libffi7 zlib1g; \ + binutils libreadline8 libncursesw6 libssl3 \ + libsqlite3-0 libgdbm6 libbz2-1.0 liblzma5 libffi8 zlib1g; \ rm -rf /var/lib/apt/lists/* COPY --from=pycompile /usr/local /usr/local diff --git a/cross-ubuntu-py/py.mk b/cross-ubuntu-py/py.mk index 27df4f3..f941762 100644 --- a/cross-ubuntu-py/py.mk +++ b/cross-ubuntu-py/py.mk @@ -45,6 +45,7 @@ build/cross-raspbian-py311: cd cross-ubuntu-py && \ docker build . \ -t wpilib/$(TYPE_RASPBIAN)-cross-ubuntu:$(YEAR)-$(VERSION_RASPBIAN)-$(UBUNTU)-py311 \ + --build-arg UBUNTU=$(UBUNTU) \ --build-arg ARCH=$(TYPE_RASPBIAN) \ --build-arg TARGET_HOST=$(TARGET_HOST_RASPBIAN) \ --build-arg AC_TARGET_HOST=$(AC_TARGET_HOST_RASPBIAN) \ @@ -74,6 +75,7 @@ build/cross-raspbian-py312: cd cross-ubuntu-py && \ docker build . \ -t wpilib/$(TYPE_RASPBIAN)-cross-ubuntu:$(YEAR)-$(VERSION_RASPBIAN)-$(UBUNTU)-py312 \ + --build-arg UBUNTU=$(UBUNTU) \ --build-arg ARCH=$(TYPE_RASPBIAN) \ --build-arg TARGET_HOST=$(TARGET_HOST_RASPBIAN) \ --build-arg AC_TARGET_HOST=$(AC_TARGET_HOST_RASPBIAN) \ @@ -103,6 +105,7 @@ build/cross-raspbian-py313: cd cross-ubuntu-py && \ docker build . \ -t wpilib/$(TYPE_RASPBIAN)-cross-ubuntu:$(YEAR)-$(VERSION_RASPBIAN)-$(UBUNTU)-py313 \ + --build-arg UBUNTU=$(UBUNTU) \ --build-arg ARCH=$(TYPE_RASPBIAN) \ --build-arg TARGET_HOST=$(TARGET_HOST_RASPBIAN) \ --build-arg AC_TARGET_HOST=$(AC_TARGET_HOST_RASPBIAN) \ @@ -129,6 +132,7 @@ build/cross-roborio-py313: cd cross-ubuntu-py && \ docker build . \ -t wpilib/$(TYPE_ROBORIO)-cross-ubuntu:$(YEAR)-$(UBUNTU)-py313 \ + --build-arg UBUNTU=$(UBUNTU) \ --build-arg ARCH=$(TYPE_ROBORIO) \ --build-arg TARGET_HOST=$(TARGET_HOST_ROBORIO) \ --build-arg AC_TARGET_HOST=$(AC_TARGET_HOST_ROBORIO) \ @@ -148,6 +152,7 @@ build/cross-systemcore-py313: cd cross-ubuntu-py && \ docker build . \ -t wpilib/$(TYPE_SYSTEMCORE)-cross-ubuntu:$(YEAR)-$(UBUNTU)-py313 \ + --build-arg UBUNTU=$(UBUNTU) \ --build-arg ARCH=$(TYPE_SYSTEMCORE) \ --build-arg TARGET_HOST=$(TARGET_HOST_SYSTEMCORE) \ --build-arg AC_TARGET_HOST=$(AC_TARGET_HOST_SYSTEMCORE) \