From 0dd088877515795ff538e6da6a90ec4cb4c4aec2 Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Thu, 28 Sep 2023 21:23:25 +0200 Subject: [PATCH 1/4] Update coolify-helper.yml --- .github/workflows/coolify-helper.yml | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/.github/workflows/coolify-helper.yml b/.github/workflows/coolify-helper.yml index 6962d1dbf..197b34fb4 100644 --- a/.github/workflows/coolify-helper.yml +++ b/.github/workflows/coolify-helper.yml @@ -56,6 +56,28 @@ jobs: platforms: linux/aarch64 push: true tags: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest-aarch64 + arm64: + runs-on: [ self-hosted, arm64 ] + permissions: + contents: read + packages: write + steps: + - uses: actions/checkout@v3 + - name: Login to ghcr.io + uses: docker/login-action@v2 + with: + registry: ${{ env.REGISTRY }} + username: ${{ github.actor }} + password: ${{ secrets.GITHUB_TOKEN }} + - name: Build image and push to registry + uses: docker/build-push-action@v3 + with: + no-cache: true + context: . + file: docker/coolify-helper/Dockerfile + platforms: linux/arm64 + push: true + tags: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest-arm64 merge-manifest: runs-on: ubuntu-latest permissions: @@ -77,7 +99,7 @@ jobs: password: ${{ secrets.GITHUB_TOKEN }} - name: Create & publish manifest run: | - docker buildx imagetools create --append ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:aarch64 --tag ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest + docker buildx imagetools create --append ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:aarch64 --append ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:arm64 --tag ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest - uses: sarisia/actions-status-discord@v1 if: always() with: From 8f24a6645600a026629f35cc0ca6d0c7c630accf Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Thu, 28 Sep 2023 21:26:55 +0200 Subject: [PATCH 2/4] Update coolify-helper.yml --- .github/workflows/coolify-helper.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/coolify-helper.yml b/.github/workflows/coolify-helper.yml index 197b34fb4..0e4f89d06 100644 --- a/.github/workflows/coolify-helper.yml +++ b/.github/workflows/coolify-helper.yml @@ -83,7 +83,7 @@ jobs: permissions: contents: read packages: write - needs: [ amd64, aarch64 ] + needs: [ amd64, aarch64, arm64 ] steps: - name: Checkout uses: actions/checkout@v3 From 62ec85ee2e33971c995cbf08a1d3fb30d5785fc3 Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Thu, 28 Sep 2023 21:31:50 +0200 Subject: [PATCH 3/4] Update coolify-helper.yml --- .github/workflows/coolify-helper.yml | 24 +----------------------- 1 file changed, 1 insertion(+), 23 deletions(-) diff --git a/.github/workflows/coolify-helper.yml b/.github/workflows/coolify-helper.yml index 0e4f89d06..f7332ef8c 100644 --- a/.github/workflows/coolify-helper.yml +++ b/.github/workflows/coolify-helper.yml @@ -56,28 +56,6 @@ jobs: platforms: linux/aarch64 push: true tags: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest-aarch64 - arm64: - runs-on: [ self-hosted, arm64 ] - permissions: - contents: read - packages: write - steps: - - uses: actions/checkout@v3 - - name: Login to ghcr.io - uses: docker/login-action@v2 - with: - registry: ${{ env.REGISTRY }} - username: ${{ github.actor }} - password: ${{ secrets.GITHUB_TOKEN }} - - name: Build image and push to registry - uses: docker/build-push-action@v3 - with: - no-cache: true - context: . - file: docker/coolify-helper/Dockerfile - platforms: linux/arm64 - push: true - tags: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest-arm64 merge-manifest: runs-on: ubuntu-latest permissions: @@ -99,7 +77,7 @@ jobs: password: ${{ secrets.GITHUB_TOKEN }} - name: Create & publish manifest run: | - docker buildx imagetools create --append ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:aarch64 --append ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:arm64 --tag ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest + docker buildx imagetools create --append ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest-aarch64 --tag ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest - uses: sarisia/actions-status-discord@v1 if: always() with: From acdfa89ec190d36d651efe0d6502bcc638588add Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Thu, 28 Sep 2023 21:32:53 +0200 Subject: [PATCH 4/4] Update coolify-helper.yml --- .github/workflows/coolify-helper.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/coolify-helper.yml b/.github/workflows/coolify-helper.yml index f7332ef8c..d174bfaf9 100644 --- a/.github/workflows/coolify-helper.yml +++ b/.github/workflows/coolify-helper.yml @@ -61,7 +61,7 @@ jobs: permissions: contents: read packages: write - needs: [ amd64, aarch64, arm64 ] + needs: [ amd64, aarch64 ] steps: - name: Checkout uses: actions/checkout@v3