Skip to content

GitLab

Unverified Commit 51db74d1 authored by Matti Picus's avatar Matti Picus Committed by GitHub
Browse files

Merge pull request #508 from radarhere/alpine 

Updated Alpine Linux version
parents 07f10c34 0c1ab7cc
Show whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
README.rst
View file @ 51db74d1
...@@ -275,8 +275,8 @@ variable. The default version is dependent on ``MB_ML_LIBC`` and ``PLAT``. ...@@ -275,8 +275,8 @@ variable. The default version is dependent on ``MB_ML_LIBC`` and ``PLAT``.
When ``MB_ML_LIBC`` is ``musllinux``: When ``MB_ML_LIBC`` is ``musllinux``:
* ``multibuild/alpine3.17_x86_64``, when ``PLAT`` is ``x86_64`` * ``multibuild/alpine3.18_x86_64``, when ``PLAT`` is ``x86_64``
* ``multibuild/alpine3.17_arm64v8``, when ``PLAT`` is ``aarch64`` * ``multibuild/alpine3.18_arm64v8``, when ``PLAT`` is ``aarch64``
Otherwise: Otherwise:
......
travis_linux_steps.sh
View file @ 51db74d1
...@@ -122,7 +122,7 @@ function install_run { ...@@ -122,7 +122,7 @@ function install_run {
if [ "$MB_ML_LIBC" == "musllinux" ]; then if [ "$MB_ML_LIBC" == "musllinux" ]; then
# PLAT is the same as $plat, # PLAT is the same as $plat,
# unless $plat is "aarch64", in which case it becomes "arm64v8" # unless $plat is "aarch64", in which case it becomes "arm64v8"
local docker_image="multibuild/alpine3.17_{PLAT}" local docker_image="multibuild/alpine3.18_{PLAT}"
elif [ "$plat" == i686 ]; then elif [ "$plat" == i686 ]; then
local docker_image="matthewbrett/trusty:32" local docker_image="matthewbrett/trusty:32"
else else
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment