From 49dc1619c2c6e4a7b39193c128be2777346abc61 Mon Sep 17 00:00:00 2001 From: Matthieu Darbois Date: Sun, 8 Sep 2024 16:07:58 +0200 Subject: [PATCH] chore: simplify entrypoint install script (#1675) --- docker/build_scripts/build_utils.sh | 2 +- docker/build_scripts/install-entrypoint.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/build_scripts/build_utils.sh b/docker/build_scripts/build_utils.sh index 961e34d05..b7dc47ba5 100755 --- a/docker/build_scripts/build_utils.sh +++ b/docker/build_scripts/build_utils.sh @@ -11,7 +11,7 @@ MANYLINUX_CXXFLAGS="-g -O2 -Wall -fdebug-prefix-map=/=. -fstack-protector-strong MANYLINUX_LDFLAGS="-Wl,-Bsymbolic-functions -Wl,-z,relro -Wl,-z,now" export BASE_POLICY=manylinux -if [ "${AUDITWHEEL_POLICY:0:9}" == "musllinux" ]; then +if [ "${AUDITWHEEL_POLICY:0:10}" == "musllinux_" ]; then export BASE_POLICY=musllinux fi diff --git a/docker/build_scripts/install-entrypoint.sh b/docker/build_scripts/install-entrypoint.sh index ea32b352e..df631dbbd 100755 --- a/docker/build_scripts/install-entrypoint.sh +++ b/docker/build_scripts/install-entrypoint.sh @@ -23,6 +23,6 @@ if [ "${AUDITWHEEL_PLAT}" = "manylinux2014_i686" ]; then LC_ALL=C "${MY_DIR}/update-system-packages.sh" fi -if [ "${AUDITWHEEL_POLICY}" = "musllinux_1_1" ] || [ "${AUDITWHEEL_POLICY}" = "musllinux_1_2" ]; then +if [ "${AUDITWHEEL_POLICY:0:10}" == "musllinux_" ]; then apk add --no-cache bash fi