From 858de8c641183d3cee9b509b67518681c77f321c Mon Sep 17 00:00:00 2001 From: Ryan Conrad Date: Thu, 30 Mar 2023 12:03:53 -0500 Subject: [PATCH 1/7] possible solution to deploy to both dockerhub and ghcr #1444 #2009 --- .github/workflows/build-multiarch.yml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.github/workflows/build-multiarch.yml b/.github/workflows/build-multiarch.yml index e09df44806d..81cba4ff8ad 100644 --- a/.github/workflows/build-multiarch.yml +++ b/.github/workflows/build-multiarch.yml @@ -113,6 +113,7 @@ jobs: # then the use of ${{ github.repository_owner }} will need to be replaced. images: | ${{ github.repository_owner }}/minecraft-server + ghcr.io/${{ github.repository_owner }}/minecraft-server tags: | type=ref,event=tag,enable=${{ matrix.variant == 'java17' }} type=ref,event=tag,suffix=-${{ matrix.variant }} @@ -160,6 +161,14 @@ jobs: username: ${{ secrets.DOCKER_USER }} password: ${{ secrets.DOCKER_PASSWORD }} + - name: Login to GHCR + uses: docker/login-action@v2 + if: env.HAS_IMAGE_REPO_ACCESS + with: + registry: ghcr.io + username: ${{ github.repository_owner }} + password: ${{ github.token }} + - name: Build and push uses: docker/build-push-action@v3.3.0 if: github.actor == github.repository_owner From cac2ceb4964b1503da1a155c20b24ba248e78feb Mon Sep 17 00:00:00 2001 From: Ryan Conrad Date: Fri, 31 Mar 2023 09:48:26 -0500 Subject: [PATCH 2/7] added CF_API_KEY to re-enable build time test for auto curseforge --- .github/workflows/build-multiarch.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build-multiarch.yml b/.github/workflows/build-multiarch.yml index 81cba4ff8ad..70ab460498f 100644 --- a/.github/workflows/build-multiarch.yml +++ b/.github/workflows/build-multiarch.yml @@ -151,6 +151,7 @@ jobs: MINECRAFT_VERSION: ${{ matrix.mcVersion }} VARIANT: ${{ matrix.variant }} MODS_FORGEAPI_KEY: ${{ secrets.MODS_FORGEAPI_KEY }} + CF_API_KEY: ${{ secrets.MODS_FORGEAPI_KEY }} run: | tests/test.sh From ec1726a87d98e780697722726caac6ea02c32d05 Mon Sep 17 00:00:00 2001 From: Geoff Bourne Date: Mon, 3 Apr 2023 14:22:12 -0500 Subject: [PATCH 3/7] Corrected image builds for test branches --- .github/workflows/build-multiarch.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-multiarch.yml b/.github/workflows/build-multiarch.yml index 70ab460498f..e84c786caae 100644 --- a/.github/workflows/build-multiarch.yml +++ b/.github/workflows/build-multiarch.yml @@ -115,13 +115,14 @@ jobs: ${{ github.repository_owner }}/minecraft-server ghcr.io/${{ github.repository_owner }}/minecraft-server tags: | - type=ref,event=tag,enable=${{ matrix.variant == 'java17' }} + type=ref,event=tag,enable=${{ matrix.variant == 'java17' && github.ref == 'master' }} type=ref,event=tag,suffix=-${{ matrix.variant }} + type=ref,event=branch,suffix=-${{ matrix.variant }},enable=${{ github.ref != 'master' }} type=raw,value=${{ matrix.variant }} # NOTE this identifies which variant will be published as "latest", which isn't # necessarily the newest version of Java flavor: | - latest=${{ matrix.variant == 'java17' }} + latest=${{ matrix.variant == 'java17' && github.ref == 'master' }} labels: | org.opencontainers.image.authors=Geoff Bourne From 9ccc980f6394282eeffd473a2ad5e088ce494f46 Mon Sep 17 00:00:00 2001 From: Geoff Bourne Date: Mon, 3 Apr 2023 14:24:18 -0500 Subject: [PATCH 4/7] Scoped tags type=raw --- .github/workflows/build-multiarch.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-multiarch.yml b/.github/workflows/build-multiarch.yml index e84c786caae..156e61d6c91 100644 --- a/.github/workflows/build-multiarch.yml +++ b/.github/workflows/build-multiarch.yml @@ -118,7 +118,7 @@ jobs: type=ref,event=tag,enable=${{ matrix.variant == 'java17' && github.ref == 'master' }} type=ref,event=tag,suffix=-${{ matrix.variant }} type=ref,event=branch,suffix=-${{ matrix.variant }},enable=${{ github.ref != 'master' }} - type=raw,value=${{ matrix.variant }} + type=raw,value=${{ matrix.variant }},enable=${{ github.ref == 'master' }} # NOTE this identifies which variant will be published as "latest", which isn't # necessarily the newest version of Java flavor: | From 4e2665407b871d62a22d8e85b55b13f7a7516cd3 Mon Sep 17 00:00:00 2001 From: Geoff Bourne Date: Mon, 3 Apr 2023 14:43:47 -0500 Subject: [PATCH 5/7] Enable image push for test branches --- .github/workflows/build-multiarch.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build-multiarch.yml b/.github/workflows/build-multiarch.yml index 156e61d6c91..fadbea8027f 100644 --- a/.github/workflows/build-multiarch.yml +++ b/.github/workflows/build-multiarch.yml @@ -179,7 +179,8 @@ jobs: push: > ${{ github.ref_type == 'tag' - || github.ref_name == 'master' + || github.ref_name == 'master' + || startsWith(github.ref_name, 'test/') || ( github.event_name == 'pull_request' && env.HAS_IMAGE_REPO_ACCESS && contains(github.event.pull_request.labels.*.name, 'ci/push-image') From e93c04b35acb1c5dac52136edf627f02d68b8df4 Mon Sep 17 00:00:00 2001 From: Geoff Bourne Date: Mon, 3 Apr 2023 21:59:51 -0500 Subject: [PATCH 6/7] Use documented login-action config --- .github/workflows/build-multiarch.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-multiarch.yml b/.github/workflows/build-multiarch.yml index fadbea8027f..1dd84fda5ff 100644 --- a/.github/workflows/build-multiarch.yml +++ b/.github/workflows/build-multiarch.yml @@ -168,8 +168,8 @@ jobs: if: env.HAS_IMAGE_REPO_ACCESS with: registry: ghcr.io - username: ${{ github.repository_owner }} - password: ${{ github.token }} + username: ${{ github.actor }} + password: ${{ secrets.GITHUB_TOKEN }} - name: Build and push uses: docker/build-push-action@v3.3.0 From 2bad50240b1c4f7ad98287ef83cafc472e898605 Mon Sep 17 00:00:00 2001 From: Geoff Bourne Date: Sat, 8 Apr 2023 12:23:21 -0500 Subject: [PATCH 7/7] Try github.token again --- .github/workflows/build-multiarch.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-multiarch.yml b/.github/workflows/build-multiarch.yml index 1dd84fda5ff..c04ad65ad69 100644 --- a/.github/workflows/build-multiarch.yml +++ b/.github/workflows/build-multiarch.yml @@ -169,7 +169,7 @@ jobs: with: registry: ghcr.io username: ${{ github.actor }} - password: ${{ secrets.GITHUB_TOKEN }} + password: ${{ github.token }} - name: Build and push uses: docker/build-push-action@v3.3.0