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..cfc30e3e 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"