From 3216a6350a5c51c29ff10603cc1d3522fbe95d74 Mon Sep 17 00:00:00 2001 From: Roshan Gautam Date: Sat, 12 Jul 2025 12:58:23 +0100 Subject: [PATCH] replace emulation with native arm --- .../workflows/build-containers-enterprise.yml | 6 +-- .github/workflows/build-containers.yml | 37 ++++++++----------- 2 files changed, 17 insertions(+), 26 deletions(-) diff --git a/.github/workflows/build-containers-enterprise.yml b/.github/workflows/build-containers-enterprise.yml index 1b675ba5..c8fa8ba2 100644 --- a/.github/workflows/build-containers-enterprise.yml +++ b/.github/workflows/build-containers-enterprise.yml @@ -25,7 +25,7 @@ jobs: include: - runnertags: ubuntu-latest arch: amd64 - - runnertags: ubuntu-latest + - runnertags: ubuntu-24.04-arm arch: arm64 runs-on: ${{ matrix.runnertags }} @@ -37,10 +37,6 @@ jobs: submodules: 'true' token: ${{ secrets.PAT_TOKEN }} - - name: Set up QEMU (For ARM64 Builds) - if: matrix.arch == 'arm64' - uses: docker/setup-qemu-action@v3 - - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 diff --git a/.github/workflows/build-containers.yml b/.github/workflows/build-containers.yml index cf2cf0ca..87050775 100644 --- a/.github/workflows/build-containers.yml +++ b/.github/workflows/build-containers.yml @@ -25,9 +25,8 @@ jobs: include: - runnertags: ubuntu-latest arch: amd64 - - runnertags: ubuntu-latest + - runnertags: ubuntu-24.04-arm arch: arm64 - runs-on: ${{ matrix.runnertags }} steps: - name: Checkout @@ -35,10 +34,6 @@ jobs: with: fetch-depth: 0 - - name: Set up QEMU (For ARM64 Builds) - if: matrix.arch == 'arm64' - uses: docker/setup-qemu-action@v3 - - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 @@ -56,10 +51,10 @@ jobs: run: | docker buildx build --platform linux/${{ matrix.arch }} \ -f Dockerfile.dev \ - -t ghcr.io/gitroomhq/postiz-app:${{ env.CONTAINERVER }}-${{ matrix.arch }} \ + -t ghcr.io/roshangm1/postiz-app:${{ env.CONTAINERVER }}-${{ matrix.arch }} \ --build-arg NEXT_PUBLIC_VERSION=${{ env.NEXT_PUBLIC_VERSION }} \ --provenance=false --sbom=false \ - --output "type=registry,name=ghcr.io/gitroomhq/postiz-app:${{ env.CONTAINERVER }}-${{ matrix.arch }}" . + --output "type=registry,name=ghcr.io/roshangm1/postiz-app:${{ env.CONTAINERVER }}-${{ matrix.arch }}" . build-container-manifest: needs: [build-containers, build-containers-common] @@ -78,29 +73,29 @@ jobs: run: | # Verify the architecture images echo "Verifying AMD64 image:" - docker buildx imagetools inspect ghcr.io/gitroomhq/postiz-app:${{ env.CONTAINERVER }}-amd64 + docker buildx imagetools inspect ghcr.io/roshangm1/postiz-app:${{ env.CONTAINERVER }}-amd64 echo "Verifying ARM64 image:" - docker buildx imagetools inspect ghcr.io/gitroomhq/postiz-app:${{ env.CONTAINERVER }}-arm64 + docker buildx imagetools inspect ghcr.io/roshangm1/postiz-app:${{ env.CONTAINERVER }}-arm64 # Try to remove any existing manifests first - docker manifest rm ghcr.io/gitroomhq/postiz-app:${{ env.CONTAINERVER }} || true - docker manifest rm ghcr.io/gitroomhq/postiz-app:latest || true + docker manifest rm ghcr.io/roshangm1/postiz-app:${{ env.CONTAINERVER }} || true + docker manifest rm ghcr.io/roshangm1/postiz-app:latest || true # Create and push the version-specific manifest - docker manifest create ghcr.io/gitroomhq/postiz-app:${{ env.CONTAINERVER }} \ - --amend ghcr.io/gitroomhq/postiz-app:${{ env.CONTAINERVER }}-amd64 \ - --amend ghcr.io/gitroomhq/postiz-app:${{ env.CONTAINERVER }}-arm64 + docker manifest create ghcr.io/roshangm1/postiz-app:${{ env.CONTAINERVER }} \ + --amend ghcr.io/roshangm1/postiz-app:${{ env.CONTAINERVER }}-amd64 \ + --amend ghcr.io/roshangm1/postiz-app:${{ env.CONTAINERVER }}-arm64 - docker manifest push ghcr.io/gitroomhq/postiz-app:${{ env.CONTAINERVER }} + docker manifest push ghcr.io/roshangm1/postiz-app:${{ env.CONTAINERVER }} # Create and push the latest manifest - docker manifest create ghcr.io/gitroomhq/postiz-app:latest \ - --amend ghcr.io/gitroomhq/postiz-app:${{ env.CONTAINERVER }}-amd64 \ - --amend ghcr.io/gitroomhq/postiz-app:${{ env.CONTAINERVER }}-arm64 + docker manifest create ghcr.io/roshangm1/postiz-app:latest \ + --amend ghcr.io/roshangm1/postiz-app:${{ env.CONTAINERVER }}-amd64 \ + --amend ghcr.io/roshangm1/postiz-app:${{ env.CONTAINERVER }}-arm64 - docker manifest push ghcr.io/gitroomhq/postiz-app:latest + docker manifest push ghcr.io/roshangm1/postiz-app:latest - name: Verify Manifest run: | - docker manifest inspect ghcr.io/gitroomhq/postiz-app:latest + docker manifest inspect ghcr.io/roshangm1/postiz-app:latest