Skip to content

Actually set UBUNTU argument in dockerfile #64

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 8, 2025
Merged

Actually set UBUNTU argument in dockerfile #64

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions cross-ubuntu-py/Dockerfile.py311
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

ARG UBUNTU=22.04
ARG UBUNTU=invalid-ubuntu
ARG ARCH=invalid-arch
ARG VERSION=invalid-version

Expand All @@ -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/*
Expand Down Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions cross-ubuntu-py/Dockerfile.py312
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

ARG UBUNTU=22.04
ARG UBUNTU=invalid-ubuntu
ARG ARCH=invalid-arch
ARG VERSION=invalid-version

Expand All @@ -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/*
Expand Down Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions cross-ubuntu-py/Dockerfile.py313
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

ARG UBUNTU=22.04
ARG UBUNTU=invalid-ubuntu
ARG ARCH=invalid-arch
ARG VERSION=invalid-version

Expand Down Expand Up @@ -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/*
Expand Down Expand Up @@ -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
Expand Down
5 changes: 5 additions & 0 deletions cross-ubuntu-py/py.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) \
Expand Down Expand Up @@ -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) \
Expand Down Expand Up @@ -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) \
Expand All @@ -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) \
Expand All @@ -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) \
Expand Down