From 989c22636950c7773a452330fc0f4bddce7241fd Mon Sep 17 00:00:00 2001 From: mattip Date: Fri, 24 Oct 2025 16:39:40 +0300 Subject: [PATCH 1/2] update docker image names --- README.rst | 14 +++++++------- travis_linux_steps.sh | 4 ++-- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/README.rst b/README.rst index 26c9c517..63ff8bad 100644 --- a/README.rst +++ b/README.rst @@ -153,20 +153,20 @@ variable. The default version is dependent on ``MB_ML_LIBC`` and ``PLAT``. When ``MB_ML_LIBC`` is ``musllinux``: -* ``multibuild/alpine3.20_x86_64``, when ``PLAT`` is ``x86_64`` -* ``multibuild/alpine3.20_arm64v8``, when ``PLAT`` is ``aarch64`` +* ``multibuild/alpine3.22_x86_64``, when ``PLAT`` is ``x86_64`` +* ``multibuild/alpine3.22_arm64v8``, when ``PLAT`` is ``aarch64`` Otherwise: -* ``multibuild/focal_x86_64``, when ``PLAT`` is ``x86_64`` +* ``multibuild/noble_x86_64``, when ``PLAT`` is ``x86_64`` * ``matthewbrett/trusty:32`` when ``PLAT`` is ``i686`` (Yes, an older image for 32-bit) -* ``multibuild/focal_arm64v8`` when ``PLAT`` is ``aarch64`` -* ``multibuild/focal_ppc64le`` when ``PLAT`` is ``ppc64le`` -* ``multibuild/focal_s390x`` when ``PLAT`` is ``s390x`` +* ``multibuild/noble_arm64v8`` when ``PLAT`` is ``aarch64`` +* ``multibuild/noble_ppc64le`` when ``PLAT`` is ``ppc64le`` +* ``multibuild/noble_s390x`` when ``PLAT`` is ``s390x`` Other valid values are any in https://quay.io/organization/pypa, using the correct platform code. Alternatively, you can use the substitution -pattern ``multibuild/focal_{PLAT}`` in the ``.travis.yml`` file. +pattern ``multibuild/noble_{PLAT}`` in the ``.travis.yml`` file. See ``multibuild/docker_test_wrap.sh``. diff --git a/travis_linux_steps.sh b/travis_linux_steps.sh index b4475293..9718fc05 100644 --- a/travis_linux_steps.sh +++ b/travis_linux_steps.sh @@ -125,13 +125,13 @@ function install_run { if [ "$MB_ML_LIBC" == "musllinux" ]; then # PLAT is the same as $plat, # unless $plat is "aarch64", in which case it becomes "arm64v8" - local docker_image="multibuild/alpine3.20_{PLAT}" + local docker_image="multibuild/alpine3.22_{PLAT}" elif [ "$plat" == i686 ]; then local docker_image="matthewbrett/trusty:32" else # PLAT is the same as $plat, # unless $plat is "aarch64", in which case it becomes "arm64v8" - local docker_image="multibuild/focal_{PLAT}" + local docker_image="multibuild/noble{PLAT}" fi else local docker_image="$DOCKER_TEST_IMAGE" From 8ea6ebe6f630db93a9b86abd4276a3d1d147d416 Mon Sep 17 00:00:00 2001 From: mattip Date: Fri, 24 Oct 2025 16:51:10 +0300 Subject: [PATCH 2/2] typo --- travis_linux_steps.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/travis_linux_steps.sh b/travis_linux_steps.sh index 9718fc05..cfc30e3e 100644 --- a/travis_linux_steps.sh +++ b/travis_linux_steps.sh @@ -131,7 +131,7 @@ function install_run { else # PLAT is the same as $plat, # unless $plat is "aarch64", in which case it becomes "arm64v8" - local docker_image="multibuild/noble{PLAT}" + local docker_image="multibuild/noble_{PLAT}" fi else local docker_image="$DOCKER_TEST_IMAGE"