Build Aarch64 executable on centos:8 (#314)

Also, move default docker build args to build_x86_64_executable.sh

Author: Jongy

exe-requirements.txt

@@ -1,3 +1,6 @@
 # requirements for the standalone executable
-pyinstaller==4.0
+pyinstaller==4.0; platform.machine == "x86_64"
+# aarch64 requires a later version due to the use of a newer centos version.
+# see https://github.com/pyinstaller/pyinstaller/issues/5540
+pyinstaller==4.10; platform.machine == "aarch64"
 staticx==0.12.1

pyi.Dockerfile

@@ -1,25 +1,15 @@
 # parts are copied from Dockerfile
 
 # these need to be defined before any FROM - otherwise, the ARGs expand to empty strings.
-
-# pyspy & rbspy, using the same builder for both pyspy and rbspy since they share build dependencies - rust:latest 1.52.1
-ARG RUST_BUILDER_VERSION=@sha256:9c106c1222abe1450f45774273f36246ebf257623ed51280dbc458632d14c9fc
-# perf - ubuntu:16.04
-ARG PERF_BUILDER_UBUNTU=@sha256:d7bb0589725587f2f67d0340edb81fd1fcba6c5f38166639cf2a252c939aa30c
-# phpspy - ubuntu:20.04
-ARG PHPSPY_BUILDER_UBUNTU=@sha256:cf31af331f38d1d7158470e095b132acd126a7180a54f263d386da88eb681d93
-# async-profiler glibc - centos:7, see explanation in Dockerfile
-ARG AP_BUILDER_CENTOS=@sha256:0f4ec88e21daf75124b8a9e5ca03c37a5e937e0e108a255d890492430789b60e
-# async-profiler musl build
-ARG AP_BUILDER_ALPINE=@sha256:69704ef328d05a9f806b6b8502915e6a0a4faa4d72018dc42343f511490daf8a
-# burn - golang:1.16.3
-ARG BURN_BUILDER_GOLANG=@sha256:f7d3519759ba6988a2b73b5874b17c5958ac7d0aa48a8b1d84d66ef25fa345f1
-# bcc & gprofiler - centos:7
-# CentOS 7 image is used to grab an old version of `glibc` during `pyinstaller` bundling.
-# this will allow the executable to run on older versions of the kernel, eventually leading to the executable running on a wider range of machines.
-ARG GPROFILER_BUILDER=@sha256:0f4ec88e21daf75124b8a9e5ca03c37a5e937e0e108a255d890492430789b60e
-# pyperf - ubuntu 20.04
-ARG PYPERF_BUILDER_UBUNTU=@sha256:cf31af331f38d1d7158470e095b132acd126a7180a54f263d386da88eb681d93
+# see build_x86_64_executable.sh and build_aarch64_executable.sh which define these.
+ARG RUST_BUILDER_VERSION
+ARG PERF_BUILDER_UBUNTU
+ARG PHPSPY_BUILDER_UBUNTU
+ARG AP_BUILDER_CENTOS
+ARG AP_BUILDER_ALPINE
+ARG BURN_BUILDER_GOLANG
+ARG GPROFILER_BUILDER
+ARG PYPERF_BUILDER_UBUNTU
 
 # pyspy & rbspy builder base
 FROM rust${RUST_BUILDER_VERSION} AS pyspy-rbspy-builder-common
@@ -100,6 +90,14 @@ RUN ./bcc_helpers_build.sh
 # bcc & gprofiler
 FROM centos${GPROFILER_BUILDER} AS build-stage
 
+# fix repo links for CentOS 8, and enable powertools (required to download glibc-static)
+RUN if grep -q "CentOS Linux 8" /etc/os-release ; then \
+    sed -i 's/mirrorlist/#mirrorlist/g' /etc/yum.repos.d/CentOS-*; \
+    sed -i 's|#baseurl=http://mirror.centos.org|baseurl=http://vault.centos.org|g' /etc/yum.repos.d/CentOS-*; \
+    yum install -y dnf-plugins-core; \
+    dnf config-manager --set-enabled powertools; \
+    fi
+
 # bcc part
 # TODO: copied from the main Dockerfile... but modified a lot. we'd want to share it some day.
 
@@ -142,7 +140,7 @@ WORKDIR /app
 
 RUN yum install -y epel-release
 RUN yum install -y gcc python3 curl python3-pip patchelf python3-devel upx
-# needed for aarch64
+# needed for aarch64 (for staticx)
 RUN if [ $(uname -m) = "aarch64" ]; then yum install -y glibc-static zlib-devel.aarch64; fi
 # needed for aarch64, scons & wheel are needed to build staticx
 RUN if [ $(uname -m) = "aarch64" ]; then python3 -m pip install 'wheel==0.37.0' 'scons==4.2.0'; fi
@@ -155,6 +153,13 @@ COPY granulate-utils/granulate_utils granulate-utils/granulate_utils
 RUN python3 -m pip install -r requirements.txt
 
 COPY exe-requirements.txt exe-requirements.txt
+# build on centos:8 of Aarch64 requires -lnss_files and -lnss_dns. the files are missing but the symbols
+# seem to be provided from another archive (e.g libc.a), so this "fix" bypasses the ld error of "missing -lnss..."
+# see https://github.com/JonathonReinhart/staticx/issues/219
+RUN if grep -q "CentOS Linux 8" /etc/os-release ; then \
+    ! test -f /lib64/libnss_files.a && ar rcs /lib64/libnss_files.a && \
+    ! test -f /lib64/libnss_dns.a && ar rcs /lib64/libnss_dns.a; \
+    fi
 RUN python3 -m pip install -r exe-requirements.txt
 
 # copy PyPerf and stuff

scripts/build_aarch64_executable.sh

@@ -10,7 +10,9 @@ UBUNTU_VERSION=@sha256:82becede498899ec668628e7cb0ad87b6e1c371cb8a1e597d83a47fac
 # rust 1.54.0
 RUST_VERSION=@sha256:33a923c30700bb627d1389b6819cfb18af2a585b2901df045924eba1ac0a9c30
 # centos 7
-CENTOS_VERSION=@sha256:43964203bf5d7fe38c6fca6166ac89e4c095e2b0c0a28f6c7c678a1348ddc7fa
+CENTOS7_VERSION=@sha256:43964203bf5d7fe38c6fca6166ac89e4c095e2b0c0a28f6c7c678a1348ddc7fa
+# centos 8
+CENTOS8_VERSION=@sha256:a27fd8080b517143cbbbab9dfb7c8571c40d67d534bbdee55bd6c473f432b177
 # golang 1.16.3
 GOLANG_VERSION=@sha256:f7d3519759ba6988a2b73b5874b17c5958ac7d0aa48a8b1d84d66ef25fa345f1
 # alpine 3.14.2
@@ -22,8 +24,8 @@ docker buildx build --platform=linux/arm64 \
     --build-arg PYPERF_BUILDER_UBUNTU=$UBUNTU_VERSION \
     --build-arg PERF_BUILDER_UBUNTU=$UBUNTU_VERSION \
     --build-arg PHPSPY_BUILDER_UBUNTU=$UBUNTU_VERSION \
-    --build-arg AP_BUILDER_CENTOS=$CENTOS_VERSION \
+    --build-arg AP_BUILDER_CENTOS=$CENTOS7_VERSION \
     --build-arg AP_BUILDER_ALPINE=$ALPINE_VERSION \
     --build-arg BURN_BUILDER_GOLANG=$GOLANG_VERSION \
-    --build-arg GPROFILER_BUILDER=$CENTOS_VERSION \
+    --build-arg GPROFILER_BUILDER=$CENTOS8_VERSION \
     . -f pyi.Dockerfile --output type=local,dest=build/aarch64/

scripts/build_x86_64_executable.sh

@@ -5,5 +5,31 @@
 #
 set -euo pipefail
 
+# pyspy & rbspy, using the same builder for both pyspy and rbspy since they share build dependencies - rust:latest 1.52.1
+RUST_BUILDER_VERSION=@sha256:9c106c1222abe1450f45774273f36246ebf257623ed51280dbc458632d14c9fc
+# perf - ubuntu:16.04 (IIRC for older glibc, to support older kernels)
+UBUNTU_VERSION_1604=@sha256:d7bb0589725587f2f67d0340edb81fd1fcba6c5f38166639cf2a252c939aa30c
+# phpspy & pyperf - ubuntu:20.04
+UBUNTU_VERSION=@sha256:cf31af331f38d1d7158470e095b132acd126a7180a54f263d386da88eb681d93
+# async-profiler glibc - centos:7
+AP_BUILDER_CENTOS=@sha256:0f4ec88e21daf75124b8a9e5ca03c37a5e937e0e108a255d890492430789b60e
+# async-profiler musl - alpine
+AP_BUILDER_ALPINE=@sha256:69704ef328d05a9f806b6b8502915e6a0a4faa4d72018dc42343f511490daf8a
+# burn - golang:1.16.3
+BURN_BUILDER_GOLANG=@sha256:f7d3519759ba6988a2b73b5874b17c5958ac7d0aa48a8b1d84d66ef25fa345f1
+# bcc & gprofiler - centos:7
+# CentOS 7 image is used to grab an old version of `glibc` during `pyinstaller` bundling.
+# this will allow the executable to run on older versions of the kernel, eventually leading to the executable running on a wider range of machines.
+GPROFILER_BUILDER=@sha256:0f4ec88e21daf75124b8a9e5ca03c37a5e937e0e108a255d890492430789b60e
+
 mkdir -p build/x86_64
-DOCKER_BUILDKIT=1 docker build -f pyi.Dockerfile --output type=local,dest=build/x86_64/ .
+DOCKER_BUILDKIT=1 docker build -f pyi.Dockerfile --output type=local,dest=build/x86_64/ \
+    --build-arg RUST_BUILDER_VERSION=$RUST_BUILDER_VERSION \
+    --build-arg PYPERF_BUILDER_UBUNTU=$UBUNTU_VERSION \
+    --build-arg PERF_BUILDER_UBUNTU=$UBUNTU_VERSION_1604 \
+    --build-arg PHPSPY_BUILDER_UBUNTU=$UBUNTU_VERSION \
+    --build-arg AP_BUILDER_CENTOS=$AP_BUILDER_CENTOS \
+    --build-arg AP_BUILDER_ALPINE=$AP_BUILDER_ALPINE \
+    --build-arg BURN_BUILDER_GOLANG=$BURN_BUILDER_GOLANG \
+    --build-arg GPROFILER_BUILDER=$GPROFILER_BUILDER \
+    .