diff options
| author | Finlay Davidson <finlay.davidson@coderclass.nl> | 2022-07-10 16:46:24 +0200 |
|---|---|---|
| committer | JF <JF002@users.noreply.github.com> | 2022-07-19 11:53:56 +0200 |
| commit | fdad3fc98568b5eff7c0f2729b868b8c12ce7c77 (patch) | |
| tree | 5783c04f03e3e9e6f4e49a586da21d295d72bd4f /.github/workflows/docker.yml | |
| parent | 2497749715c987e32b74fd74e32ce55b5877d248 (diff) | |
Fix Docker workflow not pushing on manual trigger
Also fix issue where workflow fails on pull requests when the
user who made the pull request doesn't have the secrets set.
Also allow other workflows to be triggered manually.
Also don't trigger any workflows on pull requests to master, as
there shouldn't be any pull requests against master.
Diffstat (limited to '.github/workflows/docker.yml')
| -rw-r--r-- | .github/workflows/docker.yml | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index f81831ac..8d45fe08 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -15,11 +15,13 @@ on: jobs: build: runs-on: ubuntu-latest + env: + USERNAME: infinitime steps: - uses: actions/checkout@v3 - name: Log in to Docker Hub - if: github.event_name == 'push' + if: github.event_name != 'pull_request' uses: docker/login-action@v2 with: username: ${{ secrets.DOCKER_HUB_LOGIN_USERNAME }} @@ -30,7 +32,7 @@ jobs: uses: docker/metadata-action@v4 with: images: | - ${{ secrets.DOCKER_HUB_IMAGE_USERNAME }}/infinitime-build + ${{ secrets.DOCKER_HUB_IMAGE_USERNAME || env.USERNAME }}/infinitime-build tags: | type=sha type=raw,value=latest @@ -43,7 +45,7 @@ jobs: uses: docker/setup-buildx-action@v2 - name: Build and push - if: github.event_name == 'push' + if: github.event_name != 'pull_request' uses: docker/build-push-action@v3 with: context: ./docker/ @@ -53,11 +55,11 @@ jobs: push: true tags: ${{ steps.meta.outputs.tags }} labels: ${{ steps.meta.outputs.labels }} - cache-from: type=registry,ref=${{ secrets.DOCKER_HUB_IMAGE_USERNAME }}/infinitime-build:buildcache - cache-to: type=registry,ref=${{ secrets.DOCKER_HUB_IMAGE_USERNAME }}/infinitime-build:buildcache,mode=max + cache-from: type=registry,ref=${{ secrets.DOCKER_HUB_IMAGE_USERNAME || env.USERNAME }}/infinitime-build:buildcache + cache-to: type=registry,ref=${{ secrets.DOCKER_HUB_IMAGE_USERNAME || env.USERNAME }}/infinitime-build:buildcache,mode=max - name: Build - if: github.event_name != 'push' + if: github.event_name == 'pull_request' uses: docker/build-push-action@v3 with: context: ./docker/ @@ -65,4 +67,4 @@ jobs: platforms: linux/amd64,linux/arm64 builder: ${{ steps.buildx.outputs.name }} push: false - cache-from: type=registry,ref=${{ secrets.DOCKER_HUB_IMAGE_USERNAME }}/infinitime-build:buildcache + cache-from: type=registry,ref=${{ secrets.DOCKER_HUB_IMAGE_USERNAME || env.USERNAME }}/infinitime-build:buildcache |