Skip to content

Commit e5d6bda

Browse files
sreenithicopybara-github
authored andcommitted
[Python] Update manylinux and armv7 docker images (grpc#40383)
This PR does the following: - updates the base docker images to recent ones for manylinux-x86 and manylinux-x64 - updates Python version to be installed in the armv7 images Related PRs updating other Python docker images: - grpc#40317 - grpc#40354 Closes grpc#40383 COPYBARA_INTEGRATE_REVIEW=grpc#40383 from sreenithi:update_manylinux_docker_base_images dbfe777 PiperOrigin-RevId: 793828964
1 parent c76b8ae commit e5d6bda

File tree

9 files changed

+17
-17
lines changed

9 files changed

+17
-17
lines changed

templates/tools/dockerfile/grpc_artifact_python_linux_armv7/Dockerfile.inja

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,11 @@ ADD install_python_for_wheel_crosscompilation.sh /scripts/install_python_for_whe
3131
# grep grpc_artifact_python_ tools/bazelify_tests/dockerimage_current_versions.bzl | grep -oP '(?<=docker://)[^"]+(?=")'
3232
# IMG=one_of_the_images_from_the_command_above
3333
# docker run --rm $IMG bash -c 'ls -l /opt/python/cp3{9,1}*' | sed -E 's#^[^/]+##'
34-
RUN /scripts/install_python_for_wheel_crosscompilation.sh "3.9.20" "3.9.20" /opt/python/cp39-cp39
35-
RUN /scripts/install_python_for_wheel_crosscompilation.sh "3.10.15" "3.10.15" /opt/python/cp310-cp310
36-
RUN /scripts/install_python_for_wheel_crosscompilation.sh "3.11.10" "3.11.10" /opt/python/cp311-cp311
37-
RUN /scripts/install_python_for_wheel_crosscompilation.sh "3.12.6" "3.12.6" /opt/python/cp312-cp312
38-
RUN /scripts/install_python_for_wheel_crosscompilation.sh "3.13.0" "3.13.0rc2" /opt/python/cp313-cp313
34+
RUN /scripts/install_python_for_wheel_crosscompilation.sh "3.9.23" "3.9.23" /opt/python/cp39-cp39
35+
RUN /scripts/install_python_for_wheel_crosscompilation.sh "3.10.18" "3.10.18" /opt/python/cp310-cp310
36+
RUN /scripts/install_python_for_wheel_crosscompilation.sh "3.11.13" "3.11.13" /opt/python/cp311-cp311
37+
RUN /scripts/install_python_for_wheel_crosscompilation.sh "3.12.11" "3.12.11" /opt/python/cp312-cp312
38+
RUN /scripts/install_python_for_wheel_crosscompilation.sh "3.13.5" "3.13.5" /opt/python/cp313-cp313
3939

4040
ENV AUDITWHEEL_ARCH armv7l
4141
ENV AUDITWHEEL_PLAT linux_armv7l

templates/tools/dockerfile/grpc_artifact_python_manylinux2014_x64/Dockerfile.inja

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
# AUTO-GENERATED FROM `$REPO_ROOT/templates/tools/dockerfile/grpc_artifact_python_manylinux2014_x64/Dockerfile.inja`!!!
1818

19-
FROM quay.io/pypa/manylinux2014_x86_64:2024-09-09-f386546
19+
FROM quay.io/pypa/manylinux2014_x86_64:2025.07.14-5
2020

2121
{% include "../git_config.include" %}
2222
{% include "../ccache.include" %}

templates/tools/dockerfile/grpc_artifact_python_manylinux2014_x86/Dockerfile.inja

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
# AUTO-GENERATED FROM `$REPO_ROOT/templates/tools/dockerfile/grpc_artifact_python_manylinux2014_x86/Dockerfile.inja`!!!
1818

19-
FROM quay.io/pypa/manylinux2014_i686:2024-09-09-f386546
19+
FROM quay.io/pypa/manylinux2014_i686:2025.07.14-5
2020

2121
{% include "../git_config.include" %}
2222
{% include "../ccache.include" %}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
us-docker.pkg.dev/grpc-testing/testing-images-public/grpc_artifact_python_linux_armv7:2494541fe7b010005a839336e59e4df1804b261b@sha256:aec82264360c35e7a1b7e010ac9bfcf7bd4306e95701647bf58c7d55eef74c09
1+
us-docker.pkg.dev/grpc-testing/testing-images-public/grpc_artifact_python_linux_armv7:ed37a7f0bcb9f2797bb1a0636bd96b6c7af595f7@sha256:4364153dd7ac686171fef0841898484a3df6bbbf869196d193ea97f871aa4c52

tools/dockerfile/grpc_artifact_python_linux_armv7/Dockerfile

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -53,11 +53,11 @@ ADD install_python_for_wheel_crosscompilation.sh /scripts/install_python_for_whe
5353
# grep grpc_artifact_python_ tools/bazelify_tests/dockerimage_current_versions.bzl | grep -oP '(?<=docker://)[^"]+(?=")'
5454
# IMG=one_of_the_images_from_the_command_above
5555
# docker run --rm $IMG bash -c 'ls -l /opt/python/cp3{9,1}*' | sed -E 's#^[^/]+##'
56-
RUN /scripts/install_python_for_wheel_crosscompilation.sh "3.9.20" "3.9.20" /opt/python/cp39-cp39
57-
RUN /scripts/install_python_for_wheel_crosscompilation.sh "3.10.15" "3.10.15" /opt/python/cp310-cp310
58-
RUN /scripts/install_python_for_wheel_crosscompilation.sh "3.11.10" "3.11.10" /opt/python/cp311-cp311
59-
RUN /scripts/install_python_for_wheel_crosscompilation.sh "3.12.6" "3.12.6" /opt/python/cp312-cp312
60-
RUN /scripts/install_python_for_wheel_crosscompilation.sh "3.13.0" "3.13.0rc2" /opt/python/cp313-cp313
56+
RUN /scripts/install_python_for_wheel_crosscompilation.sh "3.9.23" "3.9.23" /opt/python/cp39-cp39
57+
RUN /scripts/install_python_for_wheel_crosscompilation.sh "3.10.18" "3.10.18" /opt/python/cp310-cp310
58+
RUN /scripts/install_python_for_wheel_crosscompilation.sh "3.11.13" "3.11.13" /opt/python/cp311-cp311
59+
RUN /scripts/install_python_for_wheel_crosscompilation.sh "3.12.11" "3.12.11" /opt/python/cp312-cp312
60+
RUN /scripts/install_python_for_wheel_crosscompilation.sh "3.13.5" "3.13.5" /opt/python/cp313-cp313
6161

6262
ENV AUDITWHEEL_ARCH armv7l
6363
ENV AUDITWHEEL_PLAT linux_armv7l
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
us-docker.pkg.dev/grpc-testing/testing-images-public/grpc_artifact_python_manylinux2014_x64:96c5a9846e818dc2830c178c6ea7687324907215@sha256:896ee3637e005932ec81326a26b0879e4c853e3fcdc80eed470b09229d1df674
1+
us-docker.pkg.dev/grpc-testing/testing-images-public/grpc_artifact_python_manylinux2014_x64:876d031bcf7d1cd3c3c3f893cce743c950c19f7b@sha256:1f4bb608faee4be6eac397ffd703991ef715410f24dd50d3f03fd7412dc590ac

tools/dockerfile/grpc_artifact_python_manylinux2014_x64/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
# AUTO-GENERATED FROM `$REPO_ROOT/templates/tools/dockerfile/grpc_artifact_python_manylinux2014_x64/Dockerfile.inja`!!!
1818

19-
FROM quay.io/pypa/manylinux2014_x86_64:2024-09-09-f386546
19+
FROM quay.io/pypa/manylinux2014_x86_64:2025.07.14-5
2020

2121
# TODO: simplify the list of third_party modules list
2222
# NOTE: git>=2.46 allows leading paths like third_party/* to include all subdirectories
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
us-docker.pkg.dev/grpc-testing/testing-images-public/grpc_artifact_python_manylinux2014_x86:3742051ade5aa578406c192b40793835568120e5@sha256:fc2a5fb7f74823a8f3fda7a5412902620e45cf43279d2379fb88b86d18cdb897
1+
us-docker.pkg.dev/grpc-testing/testing-images-public/grpc_artifact_python_manylinux2014_x86:7e84a10b8bf41ef39e3ca54d86b40ab476caba84@sha256:d61d44c54a46b438098acf3d3aa9caa54a3786f28bd0dd503317bc346f3d38d1

tools/dockerfile/grpc_artifact_python_manylinux2014_x86/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
# AUTO-GENERATED FROM `$REPO_ROOT/templates/tools/dockerfile/grpc_artifact_python_manylinux2014_x86/Dockerfile.inja`!!!
1818

19-
FROM quay.io/pypa/manylinux2014_i686:2024-09-09-f386546
19+
FROM quay.io/pypa/manylinux2014_i686:2025.07.14-5
2020

2121
# TODO: simplify the list of third_party modules list
2222
# NOTE: git>=2.46 allows leading paths like third_party/* to include all subdirectories

0 commit comments

Comments
 (0)