@@ -102,9 +102,13 @@ jobs:
102102 # Pin version for Java 8, also be sure to set in verify-pr.yml
103103 mcHelperVersion : 1.51.3-java8
104104 env :
105+ # Assume they line up, but when forked change to your Docker Hub username
106+ DOCKER_HUB_ORG : ${{ github.repository_owner }}
105107 IMAGE_TO_TEST : " ${{ github.repository_owner }}/minecraft-server:test-${{ matrix.variant }}-${{ github.run_id }}"
106108 HAS_IMAGE_REPO_ACCESS : ${{ secrets.DOCKER_USER != '' && secrets.DOCKER_PASSWORD != '' }}
107109 MAIN_VARIANT : java25
110+ PUSH : ${{ github.repository_owner == 'itzg' }}
111+ IMAGE_AUTHOR : " Geoff Bourne <itzgeoff@gmail.com>"
108112 runs-on : ubuntu-22.04
109113 steps :
110114 - name : Checkout
@@ -117,10 +121,8 @@ jobs:
117121 id : meta
118122 uses : docker/metadata-action@v6.2.0
119123 with :
120- # NOTE for forks: if your Docker Hub organization doesn't match your Github repo's,
121- # then the use of ${{ github.repository_owner }} will need to be replaced.
122124 images : |
123- ${{ github.repository_owner }}/minecraft-server
125+ ${{ env.DOCKER_HUB_ORG }}/minecraft-server
124126 ghcr.io/${{ github.repository_owner }}/minecraft-server
125127 tags : |
126128 # Apply the variant as a moving tag for most recent commit per variant
@@ -142,7 +144,7 @@ jobs:
142144 flavor : |
143145 latest=${{ matrix.variant == env.MAIN_VARIANT && github.ref_name == github.event.repository.default_branch }}
144146 labels : |
145- org.opencontainers.image.authors=Geoff Bourne <itzgeoff@gmail.com>
147+ org.opencontainers.image.authors=${{ env.IMAGE_AUTHOR }}
146148
147149 - name : Setup Docker Buildx
148150 uses : docker/setup-buildx-action@v4
@@ -198,13 +200,16 @@ jobs:
198200 platforms : ${{ matrix.platforms }}
199201 push : >
200202 ${{
201- github.ref_type == 'tag'
202- || github.ref_name == github.event.repository.default_branch
203- || startsWith(github.ref_name, 'test/')
204- || ( github.event_name == 'pull_request'
205- && env.HAS_IMAGE_REPO_ACCESS
206- && contains(github.event.pull_request.labels.*.name, 'ci/push-image')
207- )
203+ env.PUSH &&
204+ (
205+ github.ref_type == 'tag'
206+ || github.ref_name == github.event.repository.default_branch
207+ || startsWith(github.ref_name, 'test/')
208+ || ( github.event_name == 'pull_request'
209+ && env.HAS_IMAGE_REPO_ACCESS
210+ && contains(github.event.pull_request.labels.*.name, 'ci/push-image')
211+ )
212+ )
208213 }}
209214 tags : ${{ steps.meta.outputs.tags }}
210215 # ensure latest base image is used
@@ -221,5 +226,6 @@ jobs:
221226 REVISION=${{ fromJSON(steps.meta.outputs.json).labels['org.opencontainers.image.revision'] }}
222227 ${{ matrix.mcHelperVersion && format('MC_HELPER_VERSION={0}', matrix.mcHelperVersion) }}
223228 ${{ matrix.knockdRepoOrg && format('KNOCKD_REPO_ORG={0}', matrix.knockdRepoOrg) }}
229+ IMAGE_AUTHOR=${{ env.IMAGE_AUTHOR }}
224230 cache-from : type=gha,scope=${{ matrix.variant }}
225231 cache-to : type=gha,mode=max,scope=${{ matrix.variant }}
0 commit comments