Skip to content

Commit 4bcb399

Browse files
minimizing manylinux glibc
1 parent c5d1c2b commit 4bcb399

4 files changed

Lines changed: 21 additions & 17 deletions

File tree

.github/workflows/docker.yml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ jobs:
1616
type: x86_64
1717
- os: ubuntu-24.04-arm
1818
type: aarch64
19+
glibc: ["2_28", "2_34"]
20+
1921
runs-on: ${{ matrix.arch.os }}
2022
steps:
2123
- name: Check out
@@ -38,8 +40,8 @@ jobs:
3840
uses: docker/build-push-action@v6
3941
with:
4042
context: docker
41-
file: docker/Dockerfile_manylinux_2_34_${{ matrix.arch.type }}
43+
file: docker/Dockerfile_manylinux_${{ matrix.glibc }}_${{ matrix.arch.type }}
4244
push: true
4345
tags: |
44-
ghcr.io/virtualcell/manylinux_2_34_${{ matrix.arch.type }}:${{ github.event.inputs.tag }}
45-
ghcr.io/virtualcell/manylinux_2_34_${{ matrix.arch.type }}:latest
46+
ghcr.io/virtualcell/manylinux_${{ matrix.glibc }}_${{ matrix.arch.type }}:${{ github.event.inputs.tag }}
47+
ghcr.io/virtualcell/manylinux_${{ matrix.glibc }}_${{ matrix.arch.type }}:latest

docker/Dockerfile_manylinux_2_28_aarch64

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ FROM quay.io/pypa/manylinux_2_28_aarch64
33
ARG GRAALVM_VERSION=23.0.2
44
ARG GRAALVM_BUILD=7.1
55
ARG GRAALVM_ARCH=aarch64
6-
ARG MAVEN_VERSION=3.9.9
6+
ARG MAVEN_VERSION=3.9.15
77

88
# install graalvm community edition
99
RUN cd /opt && \
@@ -14,12 +14,13 @@ ENV JAVA_HOME=${GRAALVM_HOME}
1414
ENV PATH=${GRAALVM_HOME}/bin:$PATH
1515

1616
# install Poetry
17-
RUN curl -sSL https://install.python-poetry.org | python3 -
17+
RUN dnf install python3.13 -y
18+
RUN ln -s /usr/local/bin/python3.13 /usr/local/bin/python3
19+
RUN (curl -sSL https://install.python-poetry.org | python3 -) || ( echo "" && echo "" && echo "" && echo 'LogContents:' && cat /poetry-installer-error-*.log && exit 1)
1820
ENV PATH=~/.local/bin:$PATH
1921

2022
# Install Maven
21-
RUN cd /opt && \
22-
curl -L -o apache-maven.tar.gz https://dlcdn.apache.org/maven/maven-3/${MAVEN_VERSION}/binaries/apache-maven-${MAVEN_VERSION}-bin.tar.gz && \
23-
tar -xzf apache-maven.tar.gz
23+
24+
RUN cd /opt && curl -L -o apache-maven.tar.gz https://dlcdn.apache.org/maven/maven-3/${MAVEN_VERSION}/binaries/apache-maven-${MAVEN_VERSION}-bin.tar.gz && ls && tar -xzvf apache-maven.tar.gz
2425
ENV MAVEN_HOME=/opt/apache-maven-${MAVEN_VERSION}
2526
ENV PATH=${MAVEN_HOME}/bin:$PATH

docker/Dockerfile_manylinux_2_28_x86_64

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ FROM quay.io/pypa/manylinux_2_28_x86_64
33
ARG GRAALVM_VERSION=23.0.2
44
ARG GRAALVM_BUILD=7.1
55
ARG GRAALVM_ARCH=x64
6-
ARG MAVEN_VERSION=3.9.9
6+
ARG MAVEN_VERSION=3.9.15
77

88
# install graalvm community edition
99
RUN cd /opt && \
@@ -14,12 +14,13 @@ ENV JAVA_HOME=${GRAALVM_HOME}
1414
ENV PATH=${GRAALVM_HOME}/bin:$PATH
1515

1616
# install Poetry
17-
RUN curl -sSL https://install.python-poetry.org | python3 -
17+
RUN dnf install python3.13 -y
18+
RUN ln -s /usr/local/bin/python3.13 /usr/local/bin/python3
19+
RUN (curl -sSL https://install.python-poetry.org | python3 -) || ( echo "" && echo "" && echo "" && echo 'LogContents:' && cat /poetry-installer-error-*.log && exit 1)
1820
ENV PATH=~/.local/bin:$PATH
1921

2022
# Install Maven
21-
RUN cd /opt && \
22-
curl -L -o apache-maven.tar.gz https://dlcdn.apache.org/maven/maven-3/${MAVEN_VERSION}/binaries/apache-maven-${MAVEN_VERSION}-bin.tar.gz && \
23-
tar -xzf apache-maven.tar.gz
23+
24+
RUN cd /opt && curl -L -o apache-maven.tar.gz https://dlcdn.apache.org/maven/maven-3/${MAVEN_VERSION}/binaries/apache-maven-${MAVEN_VERSION}-bin.tar.gz && ls && tar -xzvf apache-maven.tar.gz
2425
ENV MAVEN_HOME=/opt/apache-maven-${MAVEN_VERSION}
2526
ENV PATH=${MAVEN_HOME}/bin:$PATH

pyproject.toml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,10 @@ mkdocstrings = {extras = ["python"], version = "^0.27.0"}
4040

4141
[tool.cibuildwheel]
4242
build-frontend = "pip"
43-
manylinux-x86_64-image = "ghcr.io/virtualcell/manylinux_2_34_x86_64:latest"
44-
manylinux-pypy_x86_64-image = "ghcr.io/virtualcell/manylinux_2_34_x86_64:latest"
45-
manylinux-aarch64-image = "ghcr.io/virtualcell/manylinux_2_34_aarch64:latest"
46-
manylinux-pypy_aarch64-image = "ghcr.io/virtualcell/manylinux_2_34_aarch64:latest"
43+
manylinux-x86_64-image = "ghcr.io/virtualcell/manylinux_2_28_x86_64:latest"
44+
manylinux-pypy_x86_64-image = "ghcr.io/virtualcell/manylinux_2_28_x86_64:latest"
45+
manylinux-aarch64-image = "ghcr.io/virtualcell/manylinux_2_28_aarch64:latest"
46+
manylinux-pypy_aarch64-image = "ghcr.io/virtualcell/manylinux_2_28_aarch64:latest"
4747
skip = "*-musllinux* *i686 *ppc64le *s390x *armv7l *riscv64"
4848

4949
#[tool.cibuildwheel.linux]

0 commit comments

Comments
 (0)