dist: faster builds for ARM and ARM64

We're moving from very slow QEMU-virtualised builds to very fast ones based on cross toolchains. - refactor jobs; add checksums to release note - build and publish Docker images with ARM/ARM64 binaries
2021-03-10 03:59:19 +01:00 · 2021-03-10 03:59:19 +01:00 · eafe694536
parent 12e15a0b8d
commit eafe694536
12 changed files with 241 additions and 216 deletions
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@ -10,16 +10,6 @@ jobs:
    name: Linux AMD64 release asset
    runs-on: ubuntu-latest
    steps:
-      - name: Create release
-        id: create_release
-        uses: actions/create-release@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          tag_name: ${{ github.ref }}
-          release_name: ${{ github.ref }}
-          draft: true
-          prerelease: false
      - name: Checkout code
        uses: actions/checkout@v2
      - name: Build project
@ -27,16 +17,22 @@ jobs:
        run: |
          make dist-amd64
          cd dist
-          echo "::set-output name=linux_amd64_archive::"$(echo nimbus-eth2_Linux_amd64_*.tar.gz)
-      - name: Upload release asset
-        uses: actions/upload-release-asset@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          ARCHIVE=$(echo nimbus-eth2_Linux_amd64_*.tar.gz)
+          echo "::set-output name=archive::"${ARCHIVE}
+          echo "::set-output name=archive_dir::"${ARCHIVE%.tar.gz}
+          tar -xzf ${ARCHIVE} ${ARCHIVE%.tar.gz}/build/nimbus_beacon_node.sha512sum
+      - name: Upload archive artefact
+        uses: actions/upload-artifact@v2
        with:
-          upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: ./dist/${{ steps.make_dist.outputs.linux_amd64_archive }}
-          asset_name: ${{ steps.make_dist.outputs.linux_amd64_archive }}
-          asset_content_type: application/gzip
+          name: Linux_amd64_archive
+          path: ./dist/${{ steps.make_dist.outputs.archive }}
+          retention-days: 2
+      - name: Upload checksum artefact
+        uses: actions/upload-artifact@v2
+        with:
+          name: Linux_amd64_checksum
+          path: ./dist/${{ steps.make_dist.outputs.archive_dir }}/build/nimbus_beacon_node.sha512sum
+          retention-days: 2
      - name: Login to Docker Hub
        uses: docker/login-action@v1
        with:
@ -45,8 +41,8 @@ jobs:
      - name: Build and push a Docker image for end users
        run: |
          cd dist
-          tar -xzf ${{ steps.make_dist.outputs.linux_amd64_archive }}
-          mv nimbus-eth2_Linux_amd64_*/ ../docker/dist/binaries/nimbus-eth2
+          tar -xzf ${{ steps.make_dist.outputs.archive }}
+          mv ${{ steps.make_dist.outputs.archive_dir }} ../docker/dist/binaries/nimbus-eth2
          cd ../docker/dist/binaries
          REFNAME="${{ github.ref }}"
          TAG="${REFNAME#refs/tags/}"
@ -71,25 +67,39 @@ jobs:
        run: |
          make dist-arm64
          cd dist
-          echo "::set-output name=linux_arm64_archive::"$(echo nimbus-eth2_Linux_arm64v8_*.tar.gz)
-      - name: Fetch latest release
-        id: fetch_release
-        uses: InsonusK/get-latest-release@v1.0.1
+          ARCHIVE=$(echo nimbus-eth2_Linux_arm64v8_*.tar.gz)
+          echo "::set-output name=archive::"${ARCHIVE}
+          echo "::set-output name=archive_dir::"${ARCHIVE%.tar.gz}
+          tar -xzf ${ARCHIVE} ${ARCHIVE%.tar.gz}/build/nimbus_beacon_node.sha512sum
+      - name: Upload archive artefact
+        uses: actions/upload-artifact@v2
        with:
-          myToken: ${{ github.token }}
-          view_top: 1
-      - name: Check release version
+          name: Linux_arm64_archive
+          path: ./dist/${{ steps.make_dist.outputs.archive }}
+          retention-days: 2
+      - name: Upload checksum artefact
+        uses: actions/upload-artifact@v2
+        with:
+          name: Linux_arm64_checksum
+          path: ./dist/${{ steps.make_dist.outputs.archive_dir }}/build/nimbus_beacon_node.sha512sum
+          retention-days: 2
+      - name: Login to Docker Hub
+        uses: docker/login-action@v1
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+      - name: Build and push a Docker image for end users
        run: |
-          [[ "refs/tags/${{ steps.fetch_release.outputs.tag_name }}" == "${{ github.ref }}" ]]
-      - name: Upload release asset
-        uses: actions/upload-release-asset@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          upload_url: https://uploads.github.com/repos/${{ github.repository }}/releases/${{ steps.fetch_release.outputs.id }}/assets{?name,label}
-          asset_path: ./dist/${{ steps.make_dist.outputs.linux_arm64_archive }}
-          asset_name: ${{ steps.make_dist.outputs.linux_arm64_archive }}
-          asset_content_type: application/gzip
+          cd dist
+          tar -xzf ${{ steps.make_dist.outputs.archive }}
+          mv ${{ steps.make_dist.outputs.archive_dir }} ../docker/dist/binaries/nimbus-eth2
+          cd ../docker/dist/binaries
+          REFNAME="${{ github.ref }}"
+          TAG="${REFNAME#refs/tags/}"
+          cp -a /usr/bin/qemu-aarch64-static .
+          DOCKER_BUILDKIT=1 docker build -f Dockerfile.arm64 -t statusim/nimbus-eth2:arm64-${TAG} -t statusim/nimbus-eth2:arm64-latest .
+          docker push statusim/nimbus-eth2:arm64-${TAG}
+          docker push statusim/nimbus-eth2:arm64-latest
  build-arm:
    name: Linux ARM release asset
    runs-on: ubuntu-latest
@ -108,25 +118,39 @@ jobs:
        run: |
          make dist-arm
          cd dist
-          echo "::set-output name=linux_arm_archive::"$(echo nimbus-eth2_Linux_arm32v7_*.tar.gz)
-      - name: Fetch latest release
-        id: fetch_release
-        uses: InsonusK/get-latest-release@v1.0.1
+          ARCHIVE=$(echo nimbus-eth2_Linux_arm32v7_*.tar.gz)
+          echo "::set-output name=archive::"${ARCHIVE}
+          echo "::set-output name=archive_dir::"${ARCHIVE%.tar.gz}
+          tar -xzf ${ARCHIVE} ${ARCHIVE%.tar.gz}/build/nimbus_beacon_node.sha512sum
+      - name: Upload archive artefact
+        uses: actions/upload-artifact@v2
        with:
-          myToken: ${{ github.token }}
-          view_top: 1
-      - name: Check release version
+          name: Linux_arm_archive
+          path: ./dist/${{ steps.make_dist.outputs.archive }}
+          retention-days: 2
+      - name: Upload checksum artefact
+        uses: actions/upload-artifact@v2
+        with:
+          name: Linux_arm_checksum
+          path: ./dist/${{ steps.make_dist.outputs.archive_dir }}/build/nimbus_beacon_node.sha512sum
+          retention-days: 2
+      - name: Login to Docker Hub
+        uses: docker/login-action@v1
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+      - name: Build and push a Docker image for end users
        run: |
-          [[ "refs/tags/${{ steps.fetch_release.outputs.tag_name }}" == "${{ github.ref }}" ]]
-      - name: Upload release asset
-        uses: actions/upload-release-asset@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          upload_url: https://uploads.github.com/repos/${{ github.repository }}/releases/${{ steps.fetch_release.outputs.id }}/assets{?name,label}
-          asset_path: ./dist/${{ steps.make_dist.outputs.linux_arm_archive }}
-          asset_name: ${{ steps.make_dist.outputs.linux_arm_archive }}
-          asset_content_type: application/gzip
+          cd dist
+          tar -xzf ${{ steps.make_dist.outputs.archive }}
+          mv ${{ steps.make_dist.outputs.archive_dir }} ../docker/dist/binaries/nimbus-eth2
+          cd ../docker/dist/binaries
+          REFNAME="${{ github.ref }}"
+          TAG="${REFNAME#refs/tags/}"
+          cp -a /usr/bin/qemu-arm-static .
+          DOCKER_BUILDKIT=1 docker build -f Dockerfile.arm -t statusim/nimbus-eth2:arm-${TAG} -t statusim/nimbus-eth2:arm-latest .
+          docker push statusim/nimbus-eth2:arm-${TAG}
+          docker push statusim/nimbus-eth2:arm-latest
  build-win64:
    name: Windows AMD64 release asset
    runs-on: ubuntu-latest
@ -138,23 +162,72 @@ jobs:
        run: |
          make dist-win64
          cd dist
-          echo "::set-output name=windows_amd64_archive::"$(echo nimbus-eth2_Windows_amd64_*.tar.gz)
-      - name: Fetch latest release
-        id: fetch_release
-        uses: InsonusK/get-latest-release@v1.0.1
+          ARCHIVE=$(echo nimbus-eth2_Windows_amd64_*.tar.gz)
+          echo "::set-output name=archive::"${ARCHIVE}
+          echo "::set-output name=archive_dir::"${ARCHIVE%.tar.gz}
+          tar -xzf ${ARCHIVE} ${ARCHIVE%.tar.gz}/build/nimbus_beacon_node.sha512sum
+      - name: Upload archive artefact
+        uses: actions/upload-artifact@v2
        with:
-          myToken: ${{ github.token }}
-          view_top: 1
-      - name: Check release version
+          name: Windows_amd64_archive
+          path: ./dist/${{ steps.make_dist.outputs.archive }}
+          retention-days: 2
+      - name: Upload checksum artefact
+        uses: actions/upload-artifact@v2
+        with:
+          name: Windows_amd64_checksum
+          path: ./dist/${{ steps.make_dist.outputs.archive_dir }}/build/nimbus_beacon_node.sha512sum
+          retention-days: 2
+  prepare-release:
+    name: Prepare release draft
+    needs: [build-amd64, build-arm64, build-arm, build-win64]
+    runs-on: ubuntu-latest
+    steps:
+      - name: Download artefacts
+        uses: actions/download-artifact@v2
+      - name: Create release notes
        run: |
-          [[ "refs/tags/${{ steps.fetch_release.outputs.tag_name }}" == "${{ github.ref }}" ]]
-      - name: Upload release asset
-        uses: actions/upload-release-asset@v1
+          cat > release_notes.md <<EOF
+          ## Notes
+
+          ## SHA512 checksums
+
+          \`\`\`text
+          EOF
+          echo '# Linux AMD64' >> release_notes.md
+          cat Linux_amd64_checksum/* >> release_notes.md
+          echo '# Linux ARM64' >> release_notes.md
+          cat Linux_arm64_checksum/* >> release_notes.md
+          echo '# Linux ARM' >> release_notes.md
+          cat Linux_arm_checksum/* >> release_notes.md
+          echo '# Windows AMD64' >> release_notes.md
+          cat Windows_amd64_checksum/* >> release_notes.md
+          echo '```' >> release_notes.md
+      - name: Create release
+        id: create_release
+        uses: softprops/action-gh-release@v1
        env:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
        with:
-          upload_url: https://uploads.github.com/repos/${{ github.repository }}/releases/${{ steps.fetch_release.outputs.id }}/assets{?name,label}
-          asset_path: ./dist/${{ steps.make_dist.outputs.windows_amd64_archive }}
-          asset_name: ${{ steps.make_dist.outputs.windows_amd64_archive }}
-          asset_content_type: application/gzip
+          draft: true
+          prerelease: false
+          body_path: release_notes.md
+          files: |
+            Linux_amd64_archive/*
+            Linux_arm64_archive/*
+            Linux_arm_archive/*
+            Windows_amd64_archive/*
+      - name: Delete artefacts
+        uses: geekyeggo/delete-artifact@v1
+        with:
+          failOnError: false
+          name: |
+            Linux_amd64_archive
+            Linux_amd64_checksum
+            Linux_arm64_archive
+            Linux_arm64_checksum
+            Linux_arm_archive
+            Linux_arm_checksum
+            Windows_amd64_archive
+            Windows_amd64_checksum

--- a/16
+++ b/16
@ -513,26 +513,26 @@ publish-book: | book auditors-book
 	rm -rf tmp-book

 dist-amd64:
-	MAKE="$(MAKE)" \
+	+ MAKE="$(MAKE)" \
 		scripts/make_dist.sh amd64

 dist-arm64:
-	MAKE="$(MAKE)" \
+	+ MAKE="$(MAKE)" \
 		scripts/make_dist.sh arm64

 dist-arm:
-	MAKE="$(MAKE)" \
+	+ MAKE="$(MAKE)" \
 		scripts/make_dist.sh arm

 dist-win64:
-	MAKE="$(MAKE)" \
+	+ MAKE="$(MAKE)" \
 		scripts/make_dist.sh win64

 dist:
-	$(MAKE) dist-amd64
-	$(MAKE) dist-arm64
-	$(MAKE) dist-arm
-	$(MAKE) dist-win64
+	+ $(MAKE) dist-amd64
+	+ $(MAKE) dist-arm64
+	+ $(MAKE) dist-arm
+	+ $(MAKE) dist-win64

 #- this simple test will show any missing dynamically-linked Glibc symbols in the target distro
 dist-test:
--- a/docker/dist/Dockerfile.arm
+++ b/docker/dist/Dockerfile.arm
@ -1,16 +1,8 @@
 # The build is reproducible only if this base image stays the same.
-FROM statusteam/nimbus_beacon_node:dist_base_20210105213024_arm@sha256:2096aeba814f15d25dcf96b105197d5389d4bc9443fe20fec775868fac21d47a
+FROM statusteam/nimbus_beacon_node:dist_base_20210310012752_arm_v2@sha256:65919842dc7e17386399ae12b175e9996f5ef038ad6e228000392a1ff6465082

 SHELL ["/bin/bash", "-c"]

-ARG QEMU_NAME
-ARG QEMU_DIR
-
-# We need the host's registered binfmt_misc "interpreter" inside the container,
-# for that transparent virtualisation to work.
-# Don't bother deleting it at the end, because this image is not being pushed to the hub.
-COPY $QEMU_NAME $QEMU_DIR
-
 ARG USER_ID
 ARG GROUP_ID

--- a/docker/dist/Dockerfile.arm64
+++ b/docker/dist/Dockerfile.arm64
@ -1,16 +1,8 @@
 # The build is reproducible only if this base image stays the same.
-FROM statusteam/nimbus_beacon_node:dist_base_20210105215256_arm64@sha256:472b1625f9d0fbdff3edc7543490980e128bef26ca4e7768a5f1b43fbf85e941
+FROM statusteam/nimbus_beacon_node:dist_base_20210310021543_arm64_v2@sha256:9f63432ec61cae086235359db84575de7edd0b78320e3590285d273cbab79de2

 SHELL ["/bin/bash", "-c"]

-ARG QEMU_NAME
-ARG QEMU_DIR
-
-# We need the host's registered binfmt_misc "interpreter" inside the container,
-# for that transparent virtualisation to work.
-# Don't bother deleting it at the end, because this image is not being pushed to the hub.
-COPY $QEMU_NAME $QEMU_DIR
-
 ARG USER_ID
 ARG GROUP_ID

--- a/docker/dist/base_image/Dockerfile.arm
+++ b/docker/dist/base_image/Dockerfile.arm
@ -6,23 +6,14 @@
 # it once, upload it to Docker Hub and make sure it's being pulled regularly so
 # it's not deleted after 6 months of inactivity.

-# >=glibc-2.28 breaks things for us: https://bugs.launchpad.net/qemu/+bug/1805913
-FROM arm32v7/ubuntu:18.04
+FROM ubuntu:20.04

 SHELL ["/bin/bash", "-c"]

-ARG QEMU_NAME
-ARG QEMU_DIR
-
-# We need the host's registered binfmt_misc "interpreter" inside the container,
-# for that transparent virtualisation to work.
-COPY $QEMU_NAME $QEMU_DIR
-
-# We delete the static Qemu binary when we're done with it, because it might
-# not run on other systems. Let the child image copy it again.
 ENV DEBIAN_FRONTEND=noninteractive TZ="Etc/UTC"
 RUN apt-get -qq update \
- && apt-get -qq -y install build-essential git &>/dev/null \
+ && apt-get -qq -y install build-essential git \
+  libc6-armhf-armel-cross libc6-dev-armel-armhf-cross binutils-arm-linux-gnueabihf gcc-arm-linux-gnueabihf &>/dev/null \
 && apt-get -qq clean \
- && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* "${QEMU_DIR}/${QEMU_NAME}"
+ && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*

--- a/docker/dist/base_image/Dockerfile.arm64
+++ b/docker/dist/base_image/Dockerfile.arm64
@ -6,22 +6,14 @@
 # it once, upload it to Docker Hub and make sure it's being pulled regularly so
 # it's not deleted after 6 months of inactivity.

-FROM arm64v8/ubuntu:20.04
+FROM ubuntu:20.04

 SHELL ["/bin/bash", "-c"]

-ARG QEMU_NAME
-ARG QEMU_DIR
-
-# We need the host's registered binfmt_misc "interpreter" inside the container,
-# for that transparent virtualisation to work.
-COPY $QEMU_NAME $QEMU_DIR
-
-# We delete the static Qemu binary when we're done with it, because it might
-# not run on other systems. Let the child image copy it again.
 ENV DEBIAN_FRONTEND=noninteractive TZ="Etc/UTC"
 RUN apt-get -qq update \
- && apt-get -qq -y install build-essential git &>/dev/null \
+ && apt-get -qq -y install build-essential git \
+  binutils-aarch64-linux-gnu gcc-aarch64-linux-gnu &>/dev/null \
 && apt-get -qq clean \
- && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* "${QEMU_DIR}/${QEMU_NAME}"
+ && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*

--- a/docker/dist/base_image/Makefile
+++ b/docker/dist/base_image/Makefile
@ -17,10 +17,10 @@ build-amd64:
 	$(CURDIR)/make_base_image.sh amd64 "$(IMAGE_NAME)"

 build-arm64:
-	$(CURDIR)/make_base_image.sh arm64 "$(IMAGE_NAME)_arm64"
+	$(CURDIR)/make_base_image.sh arm64 "$(IMAGE_NAME)_arm64_v2"

 build-arm:
-	$(CURDIR)/make_base_image.sh arm "$(IMAGE_NAME)_arm"
+	$(CURDIR)/make_base_image.sh arm "$(IMAGE_NAME)_arm_v2"

 build-win64:
 	$(CURDIR)/make_base_image.sh win64 "$(IMAGE_NAME)_win64"
@ -33,10 +33,10 @@ build-win64:
 #	docker push $(IMAGE_NAME)

 #push-arm64: build-arm64
-#	docker push $(IMAGE_NAME)_arm64
+#	docker push $(IMAGE_NAME)_arm64_v2

 #push-arm: build-arm
-#	docker push $(IMAGE_NAME)_arm
+#	docker push $(IMAGE_NAME)_arm_v2

 #push-win64: build-win64
 #	docker push $(IMAGE_NAME)_win64
--- a/docker/dist/base_image/make_base_image.sh
+++ b/docker/dist/base_image/make_base_image.sh
@ -7,8 +7,7 @@
 # at your option. This file may not be copied, modified, or distributed except
 # according to those terms.

-# Build base Docker images for making distributable binaries, using Qemu for
-# foreign architectures.
+# Build base Docker images for making distributable binaries.
 # Should be used from "build-*" Make targets, passing the target architecture's
 # name and Docker image tag as parameters.

@ -23,50 +22,9 @@ fi
 ARCH="${1}"
 DOCKER_TAG="${2}"

-if [[ "${ARCH}" == "amd64" || "${ARCH}" == "win64" ]]; then
-  USE_QEMU=0
-else
-  USE_QEMU=1
-  if [[ "${ARCH}" == "arm64" ]]; then
-    BINFMT_NAME="aarch64"
-  elif [[ "${ARCH}" == "arm" ]]; then
-    BINFMT_NAME="arm"
-  fi
-fi
-
-DOCKER_EXTRA_ARGS=""
-if [[ "${USE_QEMU}" == "1" ]]; then
-  # We need qemu-user-static installed and registered in binfmt_misc, on the host
-  # (`apt install qemu binfmt-support qemu-user-static` should do the trick on Debian-based distros).
-  # The actual binary name varies from one distro to another and we need a copy inside the container.
-
-  if [[ ! -f /proc/sys/fs/binfmt_misc/qemu-${BINFMT_NAME} ]]; then
-    echo "binfmt_misc not set up properly. Aborting."
-    echo "You may have to run 'apt install qemu binfmt-support qemu-user-static' on a Debian-based distro."
-    exit 1
-  fi
-
-  QEMU_PATH="$(grep '^interpreter' /proc/sys/fs/binfmt_misc/qemu-${BINFMT_NAME} | cut -d ' ' -f 2)"
-  QEMU_NAME="$(basename ${QEMU_PATH})"
-  QEMU_DIR="$(dirname ${QEMU_PATH})"
-  DOCKER_EXTRA_ARGS="\
-    --build-arg QEMU_NAME=${QEMU_NAME} \
-    --build-arg QEMU_DIR=${QEMU_DIR} \
-  "
-fi
-
-if [[ "${USE_QEMU}" == "1" ]]; then
-  cp -a "${QEMU_PATH}" .
-fi
-
 DOCKER_BUILDKIT=1 \
  docker build \
  -t ${DOCKER_TAG} \
  --progress=plain \
-  ${DOCKER_EXTRA_ARGS} \
  -f Dockerfile.${ARCH} .

-if [[ "${USE_QEMU}" == "1" ]]; then
-  rm "${QEMU_NAME}"
-fi
-
--- a/docker/dist/binaries/Dockerfile.arm
+++ b/docker/dist/binaries/Dockerfile.arm
@ -0,0 +1,21 @@
+FROM arm32v7/debian:bullseye-slim
+
+SHELL ["/bin/bash", "-c"]
+
+# We need the host's registered binfmt_misc "interpreter" inside the container,
+# for that transparent virtualisation to work.
+COPY "qemu-arm-static" "/usr/bin/"
+
+# Likely to match the first regular user:group created on the host.
+RUN addgroup --gid 1000 user; \
+	adduser --disabled-password --gecos '' --uid 1000 --gid 1000 user;
+
+USER user
+
+STOPSIGNAL SIGINT
+
+# Docker refuses to copy the source directory here, so read it as "nimbus-eth2/*"
+COPY "nimbus-eth2" "/home/user/nimbus-eth2/"
+WORKDIR "/home/user/nimbus-eth2/"
+ENTRYPOINT ["/home/user/nimbus-eth2/build/nimbus_beacon_node"]
+
--- a/docker/dist/binaries/Dockerfile.arm64
+++ b/docker/dist/binaries/Dockerfile.arm64
@ -0,0 +1,21 @@
+FROM arm64v8/debian:bullseye-slim
+
+SHELL ["/bin/bash", "-c"]
+
+# We need the host's registered binfmt_misc "interpreter" inside the container,
+# for that transparent virtualisation to work.
+COPY "qemu-aarch64-static" "/usr/bin/"
+
+# Likely to match the first regular user:group created on the host.
+RUN addgroup --gid 1000 user; \
+	adduser --disabled-password --gecos '' --uid 1000 --gid 1000 user;
+
+USER user
+
+STOPSIGNAL SIGINT
+
+# Docker refuses to copy the source directory here, so read it as "nimbus-eth2/*"
+COPY "nimbus-eth2" "/home/user/nimbus-eth2/"
+WORKDIR "/home/user/nimbus-eth2/"
+ENTRYPOINT ["/home/user/nimbus-eth2/build/nimbus_beacon_node"]
+
--- a/docker/dist/entry_point.sh
+++ b/docker/dist/entry_point.sh
@ -29,20 +29,15 @@ if [[ "${PLATFORM}" == "Windows_amd64" ]]; then
    -j$(nproc) \
    USE_LIBBACKTRACE=0 \
    QUICK_AND_DIRTY_COMPILER=1 \
-    deps
-  make \
-    -C vendor/nim-nat-traversal/vendor/miniupnp/miniupnpc \
-    -f Makefile.mingw \
-    clean &>/dev/null
+    deps-common build/generate_makefile
+  # This can be reduced to `make CC=... ...` when it becomes possible to
+  # replace `CC=gcc` with `CC=$(CC)` in "vendor/nimbus-build-system/makefiles/targets.mk".
  make \
    -j$(nproc) \
    -C vendor/nim-nat-traversal/vendor/miniupnp/miniupnpc \
    -f Makefile.mingw \
    CC=x86_64-w64-mingw32.static-gcc \
    libminiupnpc.a &>/dev/null
-  make \
-    -C vendor/nim-nat-traversal/vendor/libnatpmp-upstream \
-    clean &>/dev/null
  make \
    -j$(nproc) \
    -C vendor/nim-nat-traversal/vendor/libnatpmp-upstream \
@ -55,6 +50,36 @@ if [[ "${PLATFORM}" == "Windows_amd64" ]]; then
    LOG_LEVEL="TRACE" \
    NIMFLAGS="-d:disableMarchNative -d:chronicles_sinks=textlines -d:chronicles_colors=none --os:windows --gcc.exe=x86_64-w64-mingw32.static-gcc --gcc.linkerexe=x86_64-w64-mingw32.static-gcc --passL:-static" \
    ${BINARIES}
+elif [[ "${PLATFORM}" == "Linux_arm32v7" ]]; then
+  CC="arm-linux-gnueabihf-gcc"
+  make \
+    -j$(nproc) \
+    USE_LIBBACKTRACE=0 \
+    QUICK_AND_DIRTY_COMPILER=1 \
+    deps-common build/generate_makefile
+  make \
+    -j$(nproc) \
+    USE_LIBBACKTRACE=0 \
+    LOG_LEVEL="TRACE" \
+    CC="${CC}" \
+    NIMFLAGS="-d:disableMarchNative -d:chronicles_sinks=textlines -d:chronicles_colors=none --cpu:arm --gcc.exe=${CC} --gcc.linkerexe=${CC}" \
+    PARTIAL_STATIC_LINKING=1 \
+    ${BINARIES}
+elif [[ "${PLATFORM}" == "Linux_arm64v8" ]]; then
+  CC="aarch64-linux-gnu-gcc"
+  make \
+    -j$(nproc) \
+    USE_LIBBACKTRACE=0 \
+    QUICK_AND_DIRTY_COMPILER=1 \
+    deps-common build/generate_makefile
+  make \
+    -j$(nproc) \
+    USE_LIBBACKTRACE=0 \
+    LOG_LEVEL="TRACE" \
+    CC="${CC}" \
+    NIMFLAGS="-d:disableMarchNative -d:chronicles_sinks=textlines -d:chronicles_colors=none --cpu:arm64 --gcc.exe=${CC} --gcc.linkerexe=${CC}" \
+    PARTIAL_STATIC_LINKING=1 \
+    ${BINARIES}
 else
  make \
    -j$(nproc) \
--- a/scripts/make_dist.sh
+++ b/scripts/make_dist.sh
@ -7,7 +7,7 @@
 # at your option. This file may not be copied, modified, or distributed except
 # according to those terms.

-# Build release binaries fit for public distribution, using Docker and Qemu.
+# Build release binaries fit for public distribution, using Docker.
 # Should be used from "dist-*" Make targets, passing the target architecture's name as a parameter.

 set -e
@ -16,62 +16,22 @@ cd "$(dirname "${BASH_SOURCE[0]}")"/..
 REPO_DIR="${PWD}"

 ARCH="${1:-amd64}"
-if [[ "${ARCH}" == "amd64" || "${ARCH}" == "win64" ]]; then
-  USE_QEMU=0
-else
-  USE_QEMU=1
-  if [[ "${ARCH}" == "arm64" ]]; then
-    BINFMT_NAME="aarch64"
-  elif [[ "${ARCH}" == "arm" ]]; then
-    BINFMT_NAME="arm"
-  fi
-fi
 DOCKER_TAG="nimbus-eth2-dist-${ARCH}"

-DOCKER_EXTRA_ARGS=""
-if [[ "${USE_QEMU}" == "1" ]]; then
-  # We need qemu-user-static installed and registered in binfmt_misc, on the host
-  # (`apt install qemu binfmt-support qemu-user-static` should do the trick on Debian-based distros).
-  # The actual binary name varies from one distro to another and we need a copy inside the container.
-
-  if [[ ! -f /proc/sys/fs/binfmt_misc/qemu-${BINFMT_NAME} ]]; then
-    echo "binfmt_misc not set up properly. Aborting."
-    echo "You may have to run 'apt install qemu binfmt-support qemu-user-static' on a Debian-based distro."
-    exit 1
-  fi
-
-  QEMU_PATH="$(grep '^interpreter' /proc/sys/fs/binfmt_misc/qemu-${BINFMT_NAME} | cut -d ' ' -f 2)"
-  QEMU_NAME="$(basename ${QEMU_PATH})"
-  QEMU_DIR="$(dirname ${QEMU_PATH})"
-  DOCKER_EXTRA_ARGS="\
-    --build-arg QEMU_NAME=${QEMU_NAME} \
-    --build-arg QEMU_DIR=${QEMU_DIR} \
-  "
-fi
-
 docker rm ${DOCKER_TAG} &>/dev/null || true

 cd docker/dist

-if [[ "${USE_QEMU}" == "1" ]]; then
-  cp -a "${QEMU_PATH}" .
-fi
-
 DOCKER_BUILDKIT=1 \
  docker build \
  -t ${DOCKER_TAG} \
  --progress=plain \
  --build-arg USER_ID=$(id -u) \
  --build-arg GROUP_ID=$(id -g) \
-  ${DOCKER_EXTRA_ARGS} \
  -f Dockerfile.${ARCH} .

 docker run --rm --name ${DOCKER_TAG} -v ${REPO_DIR}:/home/user/nimbus-eth2 ${DOCKER_TAG}

-if [[ "${USE_QEMU}" == "1" ]]; then
-  rm "${QEMU_NAME}"
-fi
-
 cd - &>/dev/null

 ls -l dist