From 3be3e15d8533acc4be797ce8447a02ff8e45497b Mon Sep 17 00:00:00 2001 From: Zahary Karadjov Date: Wed, 21 Dec 2022 10:53:17 +0200 Subject: [PATCH 1/3] Temporarily disable the macOS-AMD64 packaging --- .github/workflows/release.yml | 41 +---------------------------------- 1 file changed, 1 insertion(+), 40 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 873081b34..bf01ec857 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -268,40 +268,6 @@ jobs: name: Windows_amd64_checksum path: ./dist/${{ steps.make_dist.outputs.archive_dir }}/build/nimbus_validator_client.sha512sum retention-days: 2 - build-macos-amd64: - name: macOS AMD64 release asset - runs-on: ubuntu-latest - steps: - - name: Checkout code - uses: actions/checkout@v2 - - name: Build project - id: make_dist - run: | - make dist-macos - cd dist - ARCHIVE=$(echo nimbus-eth2_macOS_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 - tar -xzf ${ARCHIVE} ${ARCHIVE%.tar.gz}/build/nimbus_validator_client.sha512sum - - name: Upload archive artefact - uses: actions/upload-artifact@v2 - with: - name: macOS_amd64_archive - path: ./dist/${{ steps.make_dist.outputs.archive }} - retention-days: 2 - - name: Upload BN checksum artefact - uses: actions/upload-artifact@v2 - with: - name: macOS_amd64_checksum - path: ./dist/${{ steps.make_dist.outputs.archive_dir }}/build/nimbus_beacon_node.sha512sum - retention-days: 2 - - name: Upload VC checksum artefact - uses: actions/upload-artifact@v2 - with: - name: macOS_amd64_checksum - path: ./dist/${{ steps.make_dist.outputs.archive_dir }}/build/nimbus_validator_client.sha512sum - retention-days: 2 build-macos-arm64: name: macOS ARM64 release asset runs-on: ubuntu-latest @@ -338,7 +304,7 @@ jobs: retention-days: 2 prepare-release: name: Prepare release draft - needs: [build-amd64, build-arm64, build-arm, build-win64, build-macos-amd64, build-macos-arm64] + needs: [build-amd64, build-arm64, build-arm, build-win64, build-macos-arm64] runs-on: ubuntu-latest steps: - name: Download artefacts @@ -368,8 +334,6 @@ jobs: cat Linux_arm_checksum/* >> release_notes.md echo '# Windows AMD64' >> release_notes.md cat Windows_amd64_checksum/* >> release_notes.md - echo '# macOS AMD64' >> release_notes.md - cat macOS_amd64_checksum/* >> release_notes.md echo '# macOS ARM64' >> release_notes.md cat macOS_arm64_checksum/* >> release_notes.md echo '```' >> release_notes.md @@ -390,7 +354,6 @@ jobs: Linux_arm_archive/* Linux_arm_packages/* Windows_amd64_archive/* - macOS_amd64_archive/* macOS_arm64_archive/* - name: Delete artefacts uses: geekyeggo/delete-artifact@v1 @@ -408,8 +371,6 @@ jobs: Linux_arm_packages Windows_amd64_archive Windows_amd64_checksum - macOS_amd64_archive - macOS_amd64_checksum macOS_arm64_archive macOS_arm64_checksum From 5025990d9e15b14e9c07648f5da3518dcc598a5b Mon Sep 17 00:00:00 2001 From: Zahary Karadjov Date: Wed, 21 Dec 2022 19:37:17 +0200 Subject: [PATCH 2/3] Publish multiarch images for the nimbus-validator-client --- .github/workflows/release.yml | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index bf01ec857..812fede67 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -380,7 +380,7 @@ jobs: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} - - name: Build multi-arch Docker image + - name: Build multi-arch Docker images run: | REFNAME="${{ github.ref }}" TAG="${REFNAME#refs/tags/}" @@ -396,4 +396,15 @@ jobs: --amend statusim/nimbus-eth2:arm64-latest \ --amend statusim/nimbus-eth2:arm-latest docker manifest push statusim/nimbus-eth2:multiarch-latest - + docker manifest create \ + statusim/nimbus-validator-client:multiarch-${TAG} \ + --amend statusim/nimbus-validator-client:amd64-${TAG} \ + --amend statusim/nimbus-validator-client:arm64-${TAG} \ + --amend statusim/nimbus-validator-client:arm-${TAG} + docker manifest push statusim/nimbus-validator-client:multiarch-${TAG} + docker manifest create \ + statusim/nimbus-validator-client:multiarch-latest \ + --amend statusim/nimbus-validator-client:amd64-latest \ + --amend statusim/nimbus-validator-client:arm64-latest \ + --amend statusim/nimbus-validator-client:arm-latest + docker manifest push statusim/nimbus-validator-client:multiarch-latest From f6a5a5b1da51863b2db9f812e5c682ca4eaa40ab Mon Sep 17 00:00:00 2001 From: Zahary Karadjov Date: Fri, 23 Dec 2022 19:28:46 +0200 Subject: [PATCH 3/3] Provide a backwards-compatible sym link in the nimbus-eth2 docker file image This is needed because commit 0be57eec6e59a0198eccf256ec64011ee461b62f changed the location of the nimbus_beacon_node executable within the container file system. For users, not relying on the official entrypoint this was a breaking change. --- docker/dist/binaries/Dockerfile.bn.amd64 | 5 +++++ docker/dist/binaries/Dockerfile.bn.arm | 5 +++++ docker/dist/binaries/Dockerfile.bn.arm64 | 5 +++++ 3 files changed, 15 insertions(+) diff --git a/docker/dist/binaries/Dockerfile.bn.amd64 b/docker/dist/binaries/Dockerfile.bn.amd64 index bcc43f618..a4f254a91 100644 --- a/docker/dist/binaries/Dockerfile.bn.amd64 +++ b/docker/dist/binaries/Dockerfile.bn.amd64 @@ -11,5 +11,10 @@ USER user STOPSIGNAL SIGINT COPY "nimbus-eth2/build/nimbus_beacon_node" "/home/user/nimbus_beacon_node" + +RUN mkdir -p /home/user/nimbus-eth2/build && \ + ln -s /home/user/nimbus_beacon_node /home/user/nimbus-eth2/build/nimbus_beacon_node && \ + chown -R user:user /home/user/nimbus-eth2/build + WORKDIR "/home/user/" ENTRYPOINT ["/home/user/nimbus_beacon_node"] diff --git a/docker/dist/binaries/Dockerfile.bn.arm b/docker/dist/binaries/Dockerfile.bn.arm index 2c1668c31..a94fc9474 100644 --- a/docker/dist/binaries/Dockerfile.bn.arm +++ b/docker/dist/binaries/Dockerfile.bn.arm @@ -15,5 +15,10 @@ USER user STOPSIGNAL SIGINT COPY "nimbus-eth2/build/nimbus_beacon_node" "/home/user/nimbus_beacon_node" + +RUN mkdir -p /home/user/nimbus-eth2/build && \ + ln -s /home/user/nimbus_beacon_node /home/user/nimbus-eth2/build/nimbus_beacon_node && \ + chown -R user:user /home/user/nimbus-eth2/build + WORKDIR "/home/user/" ENTRYPOINT ["/home/user/nimbus_beacon_node"] diff --git a/docker/dist/binaries/Dockerfile.bn.arm64 b/docker/dist/binaries/Dockerfile.bn.arm64 index 277478e77..2dcedb158 100644 --- a/docker/dist/binaries/Dockerfile.bn.arm64 +++ b/docker/dist/binaries/Dockerfile.bn.arm64 @@ -15,5 +15,10 @@ USER user STOPSIGNAL SIGINT COPY "nimbus-eth2/build/nimbus_beacon_node" "/home/user/nimbus_beacon_node" + +RUN mkdir -p /home/user/nimbus-eth2/build && \ + ln -s /home/user/nimbus_beacon_node /home/user/nimbus-eth2/build/nimbus_beacon_node && \ + chown -R user:user /home/user/nimbus-eth2/build + WORKDIR "/home/user/" ENTRYPOINT ["/home/user/nimbus_beacon_node"]