"examples/vscode:/vscode.git/clone" did not exist on "82703dff7395dbc80d320af2d101d3ea530d2a25"
Unverified Commit 3f00257a authored by John Jones's avatar John Jones
Browse files

use python:alpine as musllinux test image

parent 1cff255d
...@@ -2,6 +2,17 @@ ...@@ -2,6 +2,17 @@
# Install and test steps on Linux # Install and test steps on Linux
set -e 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 # "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 # startup code in choose_python.sh, but the following are required and not
# necessarily already set # necessarily already set
...@@ -10,7 +21,7 @@ PYTHON_EXE=${PYTHON_EXE:-python} ...@@ -10,7 +21,7 @@ PYTHON_EXE=${PYTHON_EXE:-python}
PIP_CMD=${PIP_CMD:-pip} PIP_CMD=${PIP_CMD:-pip}
# Get needed utilities # Get needed utilities
MULTIBUILD_DIR=$(dirname "${BASH_SOURCE[0]}") MULTIBUILD_DIR=$(dirname "$0")
source $MULTIBUILD_DIR/common_utils.sh source $MULTIBUILD_DIR/common_utils.sh
# Change into root directory of repo # Change into root directory of repo
......
...@@ -111,6 +111,7 @@ function install_run { ...@@ -111,6 +111,7 @@ function install_run {
# Depends on # Depends on
# PLAT (can be passed in as argument) # PLAT (can be passed in as argument)
# MB_PYTHON_VERSION # MB_PYTHON_VERSION
# MB_ML_LIBC (optional)
# UNICODE_WIDTH (optional) # UNICODE_WIDTH (optional)
# WHEEL_SDIR (optional) # WHEEL_SDIR (optional)
# MANYLINUX_URL (optional) # MANYLINUX_URL (optional)
...@@ -118,8 +119,12 @@ function install_run { ...@@ -118,8 +119,12 @@ function install_run {
# MB_TEST_VER (optional) # MB_TEST_VER (optional)
local plat=${1:-${PLAT:-x86_64}} local plat=${1:-${PLAT:-x86_64}}
if [ -z "$DOCKER_TEST_IMAGE" ]; then if [ -z "$DOCKER_TEST_IMAGE" ]; then
local bitness=$([ "$plat" == i686 ] && echo 32 || echo 64) if [ "$MB_ML_LIBC" == "musllinux" ]; then
local docker_image="matthewbrett/trusty:$bitness" local docker_image="python:$MB_PYTHON_VERSION-alpine"
else
local bitness=$([ "$plat" == i686 ] && echo 32 || echo 64)
local docker_image="matthewbrett/trusty:$bitness"
fi
else else
# aarch64 is called arm64v8 in Ubuntu # aarch64 is called arm64v8 in Ubuntu
local plat_subst=$([ "$plat" == aarch64 ] && echo arm64v8 || echo $plat) local plat_subst=$([ "$plat" == aarch64 ] && echo arm64v8 || echo $plat)
...@@ -135,5 +140,6 @@ function install_run { ...@@ -135,5 +140,6 @@ function install_run {
-e MANYLINUX_URL="$MANYLINUX_URL" \ -e MANYLINUX_URL="$MANYLINUX_URL" \
-e TEST_DEPENDS="$TEST_DEPENDS" \ -e TEST_DEPENDS="$TEST_DEPENDS" \
-v $PWD:/io \ -v $PWD:/io \
--entrypoint sh \
$docker_image /io/$MULTIBUILD_DIR/docker_test_wrap.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