Skip to content

Reduce number of layers and optimize build of the base-python images #321

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 5 commits into from
Nov 12, 2025
Merged

Reduce number of layers and optimize build of the base-python images #321

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
031df18
Bind-mount Python patches instead of copying them to the image
sairon Nov 12, 2025
2d1b765
Create symlinks in the Python build step
sairon Nov 12, 2025
10096f6
Define PIP_VERSION arg once it's needed
sairon Nov 12, 2025
d762133
Simplify pip install step using ensurepip
sairon Nov 12, 2025
66c4180
Use --default-pip instead of creating a symlink
sairon Nov 12, 2025
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
36 changes: 10 additions & 26 deletions python/3.12/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ FROM $BUILD_FROM

ARG \
PYTHON_VERSION \
PIP_VERSION \
CERT_IDENTITY \
CERT_OIDC_ISSUER \
QEMU_CPU
Expand All @@ -14,8 +13,9 @@ ENV PATH=/usr/local/bin:$PATH
# Set shell
SHELL ["/bin/ash", "-o", "pipefail", "-c"]

COPY *.patch /usr/src/
RUN set -ex \
RUN \
--mount=type=bind,source=./patches,target=/usr/src/patches \
set -ex \
&& export PYTHON_VERSION=${PYTHON_VERSION} \
&& apk add --no-cache --virtual .fetch-deps \
openssl \
Expand Down Expand Up @@ -67,7 +67,7 @@ RUN set -ex \
# add build deps before removing fetch deps in case there's overlap
&& apk del .fetch-deps .cosign \
\
&& for i in /usr/src/*.patch; do \
&& for i in /usr/src/patches/*.patch; do \
patch -d /usr/src/python -p 1 < "${i}"; done \
&& cd /usr/src/python \
&& gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
Expand Down Expand Up @@ -102,32 +102,16 @@ RUN set -ex \
-type d -a \( -name test -o -name tests \) \
\) -exec rm -rf '{}' + \
&& rm -rf /usr/src/python \
&& rm -f /usr/src/*.patch

# make some useful symlinks that are expected to exist
RUN cd /usr/local/bin \
&& cd /usr/local/bin \
&& ln -s idle3 idle \
&& ln -s pydoc3 pydoc \
&& ln -s python3 python \
&& ln -s python3-config python-config

ARG PIP_VERSION

RUN set -ex; \
\
apk add --no-cache --virtual .fetch-deps openssl; \
\
curl -L -o get-pip.py 'https://bootstrap.pypa.io/get-pip.py'; \
\
apk del .fetch-deps; \
\
python get-pip.py \
--disable-pip-version-check \
--no-cache-dir \
pip==${PIP_VERSION} \
; \
pip --version; \
\
find /usr/local -depth \
\( \
-type d -a \( -name test -o -name tests \) \
\) -exec rm -rf '{}' +; \
rm -f get-pip.py
python -m ensurepip --upgrade --default-pip; \
pip3 install --no-cache-dir --upgrade pip=="${PIP_VERSION}"; \
pip --version
0 python/3.12/arm-alignment.patch → python/3.12/patches/arm-alignment.patch
View file
Open in desktop
File renamed without changes.
0 python/3.12/asynctio_unix_events.patch → ...n/3.12/patches/asynctio_unix_events.patch
View file
Open in desktop
File renamed without changes.
0 ...-optimize-to-add-remove-readers-and.patch → ...-optimize-to-add-remove-readers-and.patch
View file
Open in desktop
File renamed without changes.
0 ...-_BaseSelectorImpl._key_from_fd-wit.patch → ...-_BaseSelectorImpl._key_from_fd-wit.patch
View file
Open in desktop
File renamed without changes.
0 ...rs-add-get-method-to-_SelectorMappi.patch → ...rs-add-get-method-to-_SelectorMappi.patch
View file
Open in desktop
File renamed without changes.
0 ...rs-optimize-EpollSelector.select-10.patch → ...rs-optimize-EpollSelector.select-10.patch
View file
Open in desktop
File renamed without changes.
0 ...e-_run_once-for-many-iterations-of-.patch → ...e-_run_once-for-many-iterations-of-.patch
View file
Open in desktop
File renamed without changes.
0 ...-Reduce-overhead-to-connect-sockets.patch → ...-Reduce-overhead-to-connect-sockets.patch
View file
Open in desktop
File renamed without changes.
0 ...-performance-of-creating-Morsel-obj.patch → ...-performance-of-creating-Morsel-obj.patch
View file
Open in desktop
File renamed without changes.
0 python/3.12/musl-find_library.patch → python/3.12/patches/musl-find_library.patch
View file
Open in desktop
File renamed without changes.
36 changes: 10 additions & 26 deletions python/3.13/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ FROM $BUILD_FROM

ARG \
PYTHON_VERSION \
PIP_VERSION \
CERT_IDENTITY \
CERT_OIDC_ISSUER \
QEMU_CPU
Expand All @@ -14,8 +13,9 @@ ENV PATH=/usr/local/bin:$PATH
# Set shell
SHELL ["/bin/ash", "-o", "pipefail", "-c"]

COPY *.patch /usr/src/
RUN set -ex \
RUN \
--mount=type=bind,source=./patches,target=/usr/src/patches \
set -ex \
&& export PYTHON_VERSION=${PYTHON_VERSION} \
&& apk add --no-cache --virtual .fetch-deps \
openssl \
Expand Down Expand Up @@ -67,7 +67,7 @@ RUN set -ex \
# add build deps before removing fetch deps in case there's overlap
&& apk del .fetch-deps .cosign \
\
&& for i in /usr/src/*.patch; do \
&& for i in /usr/src/patches/*.patch; do \
patch -d /usr/src/python -p 1 < "${i}"; done \
&& cd /usr/src/python \
&& gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
Expand Down Expand Up @@ -102,32 +102,16 @@ RUN set -ex \
-type d -a \( -name test -o -name tests \) \
\) -exec rm -rf '{}' + \
&& rm -rf /usr/src/python \
&& rm -f /usr/src/*.patch

# make some useful symlinks that are expected to exist
RUN cd /usr/local/bin \
&& cd /usr/local/bin \
&& ln -s idle3 idle \
&& ln -s pydoc3 pydoc \
&& ln -s python3 python \
&& ln -s python3-config python-config

ARG PIP_VERSION

RUN set -ex; \
\
apk add --no-cache --virtual .fetch-deps openssl; \
\
curl -L -o get-pip.py 'https://bootstrap.pypa.io/get-pip.py'; \
\
apk del .fetch-deps; \
\
python get-pip.py \
--disable-pip-version-check \
--no-cache-dir \
pip==${PIP_VERSION} \
; \
pip --version; \
\
find /usr/local -depth \
\( \
-type d -a \( -name test -o -name tests \) \
\) -exec rm -rf '{}' +; \
rm -f get-pip.py
python -m ensurepip --upgrade --default-pip; \
pip3 install --no-cache-dir --upgrade pip=="${PIP_VERSION}"; \
pip --version
0 ...-performance-of-creating-Morsel-obj.patch → ...-performance-of-creating-Morsel-obj.patch
View file
Open in desktop
File renamed without changes.
0 ...e-state-transfer-between-concurrent.patch → ...e-state-transfer-between-concurrent.patch
View file
Open in desktop
File renamed without changes.
0 python/3.13/musl-find_library.patch → python/3.13/patches/musl-find_library.patch
View file
Open in desktop
File renamed without changes.
0 python/3.13/musl-skip_failing_tests.patch → ....13/patches/musl-skip_failing_tests.patch
View file
Open in desktop
File renamed without changes.
36 changes: 10 additions & 26 deletions python/3.14/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ FROM $BUILD_FROM

ARG \
PYTHON_VERSION \
PIP_VERSION \
CERT_IDENTITY \
CERT_OIDC_ISSUER \
QEMU_CPU
Expand All @@ -14,8 +13,9 @@ ENV PATH=/usr/local/bin:$PATH
# Set shell
SHELL ["/bin/ash", "-o", "pipefail", "-c"]

COPY *.patch /usr/src/
RUN set -ex \
RUN \
--mount=type=bind,source=./patches,target=/usr/src/patches \
set -ex \
&& export PYTHON_VERSION=${PYTHON_VERSION} \
&& apk add --no-cache --virtual .fetch-deps \
openssl \
Expand Down Expand Up @@ -67,7 +67,7 @@ RUN set -ex \
# add build deps before removing fetch deps in case there's overlap
&& apk del .fetch-deps .cosign \
\
&& for i in /usr/src/*.patch; do \
&& for i in /usr/src/patches/*.patch; do \
patch -d /usr/src/python -p 1 < "${i}"; done \
&& cd /usr/src/python \
&& gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
Expand Down Expand Up @@ -103,32 +103,16 @@ RUN set -ex \
-type d -a \( -name test -o -name tests \) \
\) -exec rm -rf '{}' + \
&& rm -rf /usr/src/python \
&& rm -f /usr/src/*.patch

# make some useful symlinks that are expected to exist
RUN cd /usr/local/bin \
&& cd /usr/local/bin \
&& ln -s idle3 idle \
&& ln -s pydoc3 pydoc \
&& ln -s python3 python \
&& ln -s python3-config python-config

ARG PIP_VERSION

RUN set -ex; \
\
apk add --no-cache --virtual .fetch-deps openssl; \
\
curl -L -o get-pip.py 'https://bootstrap.pypa.io/get-pip.py'; \
\
apk del .fetch-deps; \
\
python get-pip.py \
--disable-pip-version-check \
--no-cache-dir \
pip==${PIP_VERSION} \
; \
pip --version; \
\
find /usr/local -depth \
\( \
-type d -a \( -name test -o -name tests \) \
\) -exec rm -rf '{}' +; \
rm -f get-pip.py
python -m ensurepip --upgrade --default-pip; \
pip3 install --no-cache-dir --upgrade pip=="${PIP_VERSION}"; \
pip --version
0 ...e-state-transfer-between-concurrent.patch → ...e-state-transfer-between-concurrent.patch
View file
Open in desktop
File renamed without changes.
0 python/3.14/musl-find_library.patch → python/3.14/patches/musl-find_library.patch
View file
Open in desktop
File renamed without changes.