From 73131d0053902edf144d01f27567fa1f56c371f8 Mon Sep 17 00:00:00 2001 From: Snider Date: Sat, 27 Sep 2025 22:12:29 +0100 Subject: [PATCH] Add QEMU setup to Docker workflow and update Dockerfile deps Introduces the docker/setup-qemu-action step in the GitHub Actions workflow to support multi-architecture builds. Also updates the lthn-chain Dockerfile to include autotools-dev and checkinstall in the build dependencies. --- .github/workflows/build-docker.yml | 18 ++++++++++++------ utils/docker/images/lthn-chain/Dockerfile | 2 +- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build-docker.yml b/.github/workflows/build-docker.yml index c6f3279f..40a6c2a4 100644 --- a/.github/workflows/build-docker.yml +++ b/.github/workflows/build-docker.yml @@ -44,15 +44,18 @@ jobs: fetch-depth: 0 submodules: recursive - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v3 - - name: Login to DockerHub uses: docker/login-action@v3 with: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} + - name: Set up QEMU + uses: docker/setup-qemu-action@v3 + + - name: Set up Buildx + uses: docker/setup-buildx-action@v3 + - name: Build ${{ matrix.platform }} id: docker_build continue-on-error: true @@ -81,15 +84,18 @@ jobs: fetch-depth: 0 submodules: recursive - - name: Set up Buildx - uses: docker/setup-buildx-action@v3 - - name: Login to DockerHub uses: docker/login-action@v3 with: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} + - name: Set up QEMU + uses: docker/setup-qemu-action@v3 + + - name: Set up Buildx + uses: docker/setup-buildx-action@v3 + - name: Build id: docker_final uses: docker/build-push-action@v6 diff --git a/utils/docker/images/lthn-chain/Dockerfile b/utils/docker/images/lthn-chain/Dockerfile index 1c737e24..9e8585ff 100644 --- a/utils/docker/images/lthn-chain/Dockerfile +++ b/utils/docker/images/lthn-chain/Dockerfile @@ -21,7 +21,7 @@ ENV BUILD_TARGET=${BUILD_TARGET} RUN apt update && apt -y upgrade RUN apt install -y build-essential pkgconf \ - curl ca-certificates bison \ + curl ca-certificates bison autotools-dev checkinstall \ g++ llvm clang lld cmake \ git python3 python3-pip xz-utils gperf