Skip to content

Commit 7411392

Browse files
aptalcaaptalca
committed
finalize docker mod builder
don't require PRs to be made to the live branch, build and push all PRs (new mods' workflow info won't match the live values) PRs will be tagged just with the pr number and a prepend (without the mod name) Remove event info dumping
1 parent 58cc26c commit 7411392

File tree

1 file changed

+10
-27
lines changed

1 file changed

+10
-27
lines changed

‎.github/workflows/docker-mod-builder.yml‎

Lines changed: 10 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -42,12 +42,6 @@ jobs:
4242
with:
4343
ref: ${{ github.event.pull_request.head.sha }}
4444

45-
- name: Dump payload
46-
env:
47-
GITHUB_CONTEXT: ${{ toJson(github) }}
48-
run: |
49-
echo "$GITHUB_CONTEXT"
50-
5145
- name: Set Vars
5246
run: |
5347
echo "BASEIMAGE=${{ inputs.BASEIMAGE }}" >> $GITHUB_ENV
@@ -56,17 +50,6 @@ jobs:
5650
echo "GITHUB_REPO=${{ inputs.GITHUB_REPO }}" >> $GITHUB_ENV
5751
echo "MOD_VERSION=${{ inputs.MOD_VERSION }}" >> $GITHUB_ENV
5852
59-
- name: Dump vars
60-
run: |
61-
echo "BASEIMAGE is ${BASEIMAGE}"
62-
echo "GITHUB_REPO is ${GITHUB_REPO}"
63-
echo "MODNAME is ${MODNAME}"
64-
echo "ENDPOINT is ${ENDPOINT}"
65-
echo "MOD_VERSION is ${MOD_VERSION}"
66-
echo "github.repository is ${{ github.repository }}"
67-
echo "github.event.pull_request.base.ref is ${{ github.event.pull_request.base.ref }}"
68-
echo "github.event.pull_request.base.repo.name is ${{ github.event.pull_request.base.repo.name }}"
69-
7053
- name: Set up QEMU
7154
uses: docker/setup-qemu-action@v2
7255

@@ -89,13 +72,13 @@ jobs:
8972
fi
9073
9174
- name: Tag image (PR)
92-
if: ${{ github.event.pull_request.base.ref == format('{0}-{1}', env.BASEIMAGE, env.MODNAME) && env.GITHUB_REPO == format('{0}/{1}', github.event.pull_request.base.repo.owner.login, github.event.pull_request.base.repo.name) }}
75+
if: ${{ env.GITHUB_REPO == format('{0}/{1}', github.event.pull_request.base.repo.owner.login, github.event.pull_request.base.repo.name) }}
9376
run: |
94-
docker tag ${{ github.sha }} ${ENDPOINT}:${BASEIMAGE}-${MODNAME}-pull_request_${{ github.event.pull_request.number }}
95-
docker tag ${{ github.sha }} ghcr.io/${ENDPOINT}:${BASEIMAGE}-${MODNAME}-pull_request_${{ github.event.pull_request.number }}
77+
docker tag ${{ github.sha }} ${ENDPOINT}:pull_request_${{ github.event.pull_request.number }}
78+
docker tag ${{ github.sha }} ghcr.io/${ENDPOINT}:pull_request_${{ github.event.pull_request.number }}
9679
9780
- name: Credential check
98-
if: ${{ github.event_name == 'push' && github.ref == format('refs/heads/{0}-{1}', env.BASEIMAGE, env.MODNAME) && env.GITHUB_REPO == github.repository || github.event.pull_request.base.ref == format('{0}-{1}', env.BASEIMAGE, env.MODNAME) && env.GITHUB_REPO == format('{0}/{1}', github.event.pull_request.base.repo.owner.login, github.event.pull_request.base.repo.name) }}
81+
if: ${{ github.event_name == 'push' && github.ref == format('refs/heads/{0}-{1}', env.BASEIMAGE, env.MODNAME) && env.GITHUB_REPO == github.repository || env.GITHUB_REPO == format('{0}/{1}', github.event.pull_request.base.repo.owner.login, github.event.pull_request.base.repo.name) }}
9982
run: |
10083
echo "CR_USER=${{ secrets.CR_USER }}" >> $GITHUB_ENV
10184
echo "CR_PAT=${{ secrets.CR_PAT }}" >> $GITHUB_ENV
@@ -109,7 +92,7 @@ jobs:
10992
fi
11093
11194
- name: Login to GitHub Container Registry
112-
if: ${{ (github.event_name == 'push' && github.ref == format('refs/heads/{0}-{1}', env.BASEIMAGE, env.MODNAME) && env.GITHUB_REPO == github.repository || github.event.pull_request.base.ref == format('{0}-{1}', env.BASEIMAGE, env.MODNAME) && env.GITHUB_REPO == format('{0}/{1}', github.event.pull_request.base.repo.owner.login, github.event.pull_request.base.repo.name)) && env.CR_USER && env.CR_PAT }}
95+
if: ${{ (github.event_name == 'push' && github.ref == format('refs/heads/{0}-{1}', env.BASEIMAGE, env.MODNAME) && env.GITHUB_REPO == github.repository || env.GITHUB_REPO == format('{0}/{1}', github.event.pull_request.base.repo.owner.login, github.event.pull_request.base.repo.name)) && env.CR_USER && env.CR_PAT }}
11396
run: |
11497
echo "${{ secrets.CR_PAT }}" | docker login ghcr.io -u ${{ secrets.CR_USER }} --password-stdin
11598
@@ -124,12 +107,12 @@ jobs:
124107
fi
125108
126109
- name: Push tags to GitHub Container Registry (PR)
127-
if: ${{ github.event.pull_request.base.ref == format('{0}-{1}', env.BASEIMAGE, env.MODNAME) && env.GITHUB_REPO == format('{0}/{1}', github.event.pull_request.base.repo.owner.login, github.event.pull_request.base.repo.name) && env.CR_USER && env.CR_PAT }}
110+
if: ${{ env.GITHUB_REPO == format('{0}/{1}', github.event.pull_request.base.repo.owner.login, github.event.pull_request.base.repo.name) && env.CR_USER && env.CR_PAT }}
128111
run: |
129-
docker push ghcr.io/${ENDPOINT}:${BASEIMAGE}-${MODNAME}-pull_request_${{ github.event.pull_request.number }}
112+
docker push ghcr.io/${ENDPOINT}:pull_request_${{ github.event.pull_request.number }}
130113
131114
- name: Login to DockerHub
132-
if: ${{ (github.event_name == 'push' && github.ref == format('refs/heads/{0}-{1}', env.BASEIMAGE, env.MODNAME) && env.GITHUB_REPO == github.repository || github.event.pull_request.base.ref == format('{0}-{1}', env.BASEIMAGE, env.MODNAME) && env.GITHUB_REPO == format('{0}/{1}', github.event.pull_request.base.repo.owner.login, github.event.pull_request.base.repo.name)) && env.DOCKERUSER && env.DOCKERPASS }}
115+
if: ${{ (github.event_name == 'push' && github.ref == format('refs/heads/{0}-{1}', env.BASEIMAGE, env.MODNAME) && env.GITHUB_REPO == github.repository || env.GITHUB_REPO == format('{0}/{1}', github.event.pull_request.base.repo.owner.login, github.event.pull_request.base.repo.name)) && env.DOCKERUSER && env.DOCKERPASS }}
133116
run: |
134117
echo ${{ secrets.DOCKERPASS }} | docker login -u ${{ secrets.DOCKERUSER }} --password-stdin
135118
@@ -144,6 +127,6 @@ jobs:
144127
fi
145128
146129
- name: Push tags to DockerHub (PR)
147-
if: ${{ github.event.pull_request.base.ref == format('{0}-{1}', env.BASEIMAGE, env.MODNAME) && env.GITHUB_REPO == format('{0}/{1}', github.event.pull_request.base.repo.owner.login, github.event.pull_request.base.repo.name) && env.DOCKERUSER && env.DOCKERPASS }}
130+
if: ${{ env.GITHUB_REPO == format('{0}/{1}', github.event.pull_request.base.repo.owner.login, github.event.pull_request.base.repo.name) && env.DOCKERUSER && env.DOCKERPASS }}
148131
run: |
149-
docker push ${ENDPOINT}:${BASEIMAGE}-${MODNAME}-pull_request_${{ github.event.pull_request.number }}
132+
docker push ${ENDPOINT}:pull_request_${{ github.event.pull_request.number }}

0 commit comments

Comments
 (0)