From 6db56a93da0e1f319634342060fa0824733ff213 Mon Sep 17 00:00:00 2001 From: James Chapman Date: Mon, 24 Jul 2023 16:30:14 +0100 Subject: [PATCH] Update Docker Image workflow --- .github/workflows/docker-image.yml | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index ba28ac3..051c292 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image.yml @@ -2,7 +2,9 @@ name: Docker Image CI on: push: - branches: [ "main" ] + branches: ['main'] + pull_request: + branches: ['main'] jobs: build: @@ -13,22 +15,28 @@ jobs: packages: write steps: - - uses: actions/checkout@v3 + - name: Checkout + uses: actions/checkout@v3 - - uses: docker/login-action@v2.2.0 + - name: Login to GitHub Container Registry + if: github.event_name != 'pull_request' + uses: docker/login-action@v2 with: registry: ghcr.io username: ${{github.actor}} password: ${{secrets.GITHUB_TOKEN}} - - uses: docker/metadata-action@v4.6.0 + - name: Extract metadata + uses: docker/metadata-action@v4 id: meta with: - images: ghcr.io/groceries + images: ghcr.io/jamsch0/groceries + tags: type=raw,value=latest,enable={{is_default_branch}} - - uses: docker/build-push-action@v4.1.1 + - name: Build and push + uses: docker/build-push-action@v4 with: context: . - push: true + push: ${{github.event_name != 'pull_request'}} tags: ${{steps.meta.outputs.tags}} labels: ${{steps.meta.outputs.labels}}