Unverified Commit 72868479 authored by John Jones's avatar John Jones
Browse files

switch to multibuild provided alpine test images because... reasons?

parent 980d9b0e
......@@ -2,17 +2,6 @@
# Install and test steps on Linux
set -e
# shim for python:alpine not having bash
if [ -f "/etc/alpine-release" ]; then
apk update
apk add bash
fi
if [ -z "$BASH" ]; then
bash $0 $@
exit $?
fi
# "python" and "pip" are already on the path as part of the docker
# startup code in choose_python.sh, but the following are required and not
# necessarily already set
......
......@@ -120,7 +120,7 @@ function install_run {
local plat=${1:-${PLAT:-x86_64}}
if [ -z "$DOCKER_TEST_IMAGE" ]; then
if [ "$MB_ML_LIBC" == "musllinux" ]; then
local docker_image="python:$MB_PYTHON_VERSION-alpine"
local docker_image="multibuild/alpine3.14_$plat"
else
local bitness=$([ "$plat" == i686 ] && echo 32 || echo 64)
local docker_image="matthewbrett/trusty:$bitness"
......@@ -140,6 +140,5 @@ function install_run {
-e MANYLINUX_URL="$MANYLINUX_URL" \
-e TEST_DEPENDS="$TEST_DEPENDS" \
-v $PWD:/io \
--entrypoint sh \
$docker_image /io/$MULTIBUILD_DIR/docker_test_wrap.sh
}
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