Merge pull request #1135 from lkollar/musl

Add image for musllinux_1_1

Author: mayeut

.github/workflows/build.yml

@@ -34,6 +34,10 @@ jobs:
             platform: "i686"
           - policy: "manylinux_2_24"
             platform: "x86_64"
+          - policy: "musllinux_1_1"
+            platform: "x86_64"
+          - policy: "musllinux_1_1"
+            platform: "i686"
 
     env:
       POLICY: ${{ matrix.policy }}

.travis.yml

@@ -38,6 +38,14 @@ jobs:
       env: POLICY="manylinux_2_24" PLATFORM="s390x"
     - arch: ppc64le
       env: POLICY="manylinux_2_24" PLATFORM="ppc64le" MANYLINUX_BUILD_FRONTEND="buildkit"
+    - arch: arm64-graviton2
+      virt: vm
+      group: edge
+      env: POLICY="musllinux_1_1" PLATFORM="aarch64"
+    - arch: s390x
+      env: POLICY="musllinux_1_1" PLATFORM="s390x"
+    - arch: ppc64le
+      env: POLICY="musllinux_1_1" PLATFORM="ppc64le" MANYLINUX_BUILD_FRONTEND="buildkit"
 
 before_install:
   - if [ -d "${HOME}/buildx-cache/.buildx-cache-${POLICY}_${PLATFORM}" ]; then cp -rlf ${HOME}/buildx-cache/.buildx-cache-${POLICY}_${PLATFORM} ./; fi

build.sh

@@ -62,6 +62,11 @@ elif [ "${POLICY}" == "manylinux_2_24" ]; then
 	DEVTOOLSET_ROOTPATH=
 	PREPEND_PATH=
 	LD_LIBRARY_PATH_ARG=
+elif [ "${POLICY}" == "musllinux_1_1" ]; then
+	BASEIMAGE="${MULTIARCH_PREFIX}alpine:3.12"
+	DEVTOOLSET_ROOTPATH=
+	PREPEND_PATH=
+	LD_LIBRARY_PATH_ARG=
 else
 	echo "Unsupported policy: '${POLICY}'"
 	exit 1

docker/Dockerfile

@@ -25,12 +25,19 @@ ENV PKG_CONFIG_PATH=/usr/local/lib/pkgconfig
 COPY build_scripts/fixup-mirrors.sh /usr/local/sbin/fixup-mirrors
 
 # setup entrypoint, this will wrap commands with `linux32` with i686 images
-COPY build_scripts/install-entrypoint.sh build_scripts/update-system-packages.sh /build_scripts/
-RUN bash /build_scripts/install-entrypoint.sh && rm -rf /build_scripts
+COPY build_scripts/install-entrypoint.sh \
+     build_scripts/update-system-packages.sh \
+     build_scripts/build_utils.sh \
+     /build_scripts/
+
+RUN /build_scripts/install-entrypoint.sh && rm -rf /build_scripts
 COPY manylinux-entrypoint /usr/local/bin/manylinux-entrypoint
 ENTRYPOINT ["manylinux-entrypoint"]
 
-COPY build_scripts/install-runtime-packages.sh build_scripts/update-system-packages.sh /build_scripts/
+COPY build_scripts/install-runtime-packages.sh \
+     build_scripts/update-system-packages.sh \
+     build_scripts/build_utils.sh \
+     /build_scripts/
 RUN manylinux-entrypoint /build_scripts/install-runtime-packages.sh && rm -rf /build_scripts/
 
 COPY build_scripts/build_utils.sh /build_scripts/
@@ -68,7 +75,6 @@ RUN export LIBXCRYPT_VERSION=4.4.26 && \
     export PERL_DOWNLOAD_URL=https://www.cpan.org/src/5.0 && \
     manylinux-entrypoint /build_scripts/install-libxcrypt.sh
 
-
 FROM runtime_base AS build_base
 COPY build_scripts/install-build-packages.sh /build_scripts/
 RUN manylinux-entrypoint /build_scripts/install-build-packages.sh

docker/build_scripts/build-git.sh

@@ -7,6 +7,10 @@ set -exuo pipefail
 # Get script directory
 MY_DIR=$(dirname "${BASH_SOURCE[0]}")
 
+if [ "${POLICY}" == "musllinux_1_1" ]; then
+	export NO_REGEX=NeedsStartEnd
+fi
+
 # Get build utilities
 source $MY_DIR/build_utils.sh
 

docker/build_scripts/build-openssl.sh

@@ -27,6 +27,8 @@ fi
 
 if which yum; then
 	yum erase -y openssl-devel
+elif which apk; then
+	apk del openssl-dev
 else
 	apt-get remove -y libssl-dev
 fi

docker/build_scripts/build-sqlite3.sh

@@ -30,7 +30,7 @@ strip_ /manylinux-rootfs
 
 # Install
 cp -rlf /manylinux-rootfs/* /
-ldconfig
+ldconfig /
 
 # Clean-up for runtime
 rm -rf /manylinux-rootfs/usr/local/share

docker/build_scripts/build_utils.sh

@@ -10,6 +10,10 @@ MANYLINUX_CFLAGS="-g -O2 -Wall -fdebug-prefix-map=/=. -fstack-protector-strong -
 MANYLINUX_CXXFLAGS="-g -O2 -Wall -fdebug-prefix-map=/=. -fstack-protector-strong -Wformat -Werror=format-security"
 MANYLINUX_LDFLAGS="-Wl,-Bsymbolic-functions -Wl,-z,relro -Wl,-z,now"
 
+export BASE_POLICY=manylinux
+if [ "${POLICY:0:9}" == "musllinux" ]; then
+	export BASE_POLICY=musllinux
+fi
 
 function check_var {
     if [ -z "$1" ]; then

docker/build_scripts/finalize.sh

@@ -75,7 +75,13 @@ deactivate
 pushd $MY_DIR/requirements-tools
 for TOOL_PATH in $(find . -type f); do
 	TOOL=$(basename ${TOOL_PATH})
-	pipx install --pip-args="--require-hashes -r" ${TOOL}
+	if [ "${TOOL}" == "cmake" ] && [ "${POLICY}" == "musllinux_1_1" ]; then
+		# TODO remove this exception once https://github.com/scikit-build/cmake-python-distributions
+		# provides a musllinux wheel
+		apk add --no-cache cmake
+	else
+		pipx install --pip-args="--require-hashes -r" ${TOOL}
+	fi
 done
 popd
 

docker/build_scripts/install-build-packages.sh

@@ -19,6 +19,9 @@ if [ "${AUDITWHEEL_POLICY}" == "manylinux2010" ] || [ "${AUDITWHEEL_POLICY}" ==
 elif [ "${AUDITWHEEL_POLICY}" == "manylinux_2_24" ]; then
 	PACKAGE_MANAGER=apt
 	COMPILE_DEPS="libz-dev libbz2-dev libexpat1-dev libncurses5-dev libreadline-dev tk-dev libgdbm-dev libdb-dev libpcap-dev liblzma-dev openssl libssl-dev libkeyutils-dev libkrb5-dev comerr-dev libidn2-0-dev libcurl4-openssl-dev uuid-dev libffi-dev linux-kernel-headers"
+elif [ "${AUDITWHEEL_POLICY}" == "musllinux_1_1" ]; then
+	PACKAGE_MANAGER=apk
+	COMPILE_DEPS="zlib-dev bzip2-dev expat-dev ncurses-dev readline-dev tk-dev gdbm-dev libpcap-dev xz-dev openssl openssl-dev keyutils-dev krb5-dev libcom_err libidn-dev curl-dev util-linux-dev libffi-dev linux-headers"
 else
 	echo "Unsupported policy: '${AUDITWHEEL_POLICY}'"
 	exit 1
@@ -35,6 +38,8 @@ elif [ "${PACKAGE_MANAGER}" == "apt" ]; then
 	apt-get install -qq -y --no-install-recommends ${COMPILE_DEPS}
 	apt-get clean -qq
 	rm -rf /var/lib/apt/lists/*
+elif [ "${PACKAGE_MANAGER}" == "apk" ]; then
+	apk add --no-cache ${COMPILE_DEPS}
 else
 	echo "Not implemented"
 	exit 1