Skip to content

Commit

Permalink
Merge pull request #527 from radarhere/alpine
Browse files Browse the repository at this point in the history
Updated Alpine Linux version
  • Loading branch information
mattip authored Oct 9, 2024
2 parents 8841b12 + 66ffedb commit bc85a08
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -275,8 +275,8 @@ variable. The default version is dependent on ``MB_ML_LIBC`` and ``PLAT``.

When ``MB_ML_LIBC`` is ``musllinux``:

* ``multibuild/alpine3.18_x86_64``, when ``PLAT`` is ``x86_64``
* ``multibuild/alpine3.18_arm64v8``, when ``PLAT`` is ``aarch64``
* ``multibuild/alpine3.20_x86_64``, when ``PLAT`` is ``x86_64``
* ``multibuild/alpine3.20_arm64v8``, when ``PLAT`` is ``aarch64``

Otherwise:

Expand Down
2 changes: 1 addition & 1 deletion travis_linux_steps.sh
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ 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.18_{PLAT}"
local docker_image="multibuild/alpine3.20_{PLAT}"
elif [ "$plat" == i686 ]; then
local docker_image="matthewbrett/trusty:32"
else
Expand Down

0 comments on commit bc85a08

Please sign in to comment.