Skip to content

Commit

Permalink
Fix workflows
Browse files Browse the repository at this point in the history
  • Loading branch information
TheReverend403 committed Mar 21, 2024
1 parent 10c12b6 commit 719f642
Showing 1 changed file with 9 additions and 8 deletions.
17 changes: 9 additions & 8 deletions .github/workflows/build-docker-image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,13 @@ name: Build and push Docker image
on:
push:
branches:
- "main"
- 'main'
tags:
- "v*"
- 'v*'
pull_request:
branches:
- "main"
- 'main'
workflow_call:

env:
REGISTRY: ghcr.io
Expand All @@ -28,7 +29,7 @@ jobs:
uses: docker/setup-buildx-action@v3

- name: Log in to the container registry
if: github.event_name != "pull_request"
if: github.event_name != 'pull_request'
uses: docker/login-action@v3
with:
registry: ${{ env.REGISTRY }}
Expand All @@ -49,10 +50,10 @@ jobs:
- name: Build and push Docker image
uses: docker/build-push-action@v5
with:
push: ${{ github.event_name != "pull_request" }}
push: ${{ github.event_name != 'pull_request' }}
tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }}
build-args: |
META_VERSION=${{ fromJSON(steps.meta.outputs.json).labels["org.opencontainers.image.version"] }}
META_VERSION_HASH=${{ fromJSON(steps.meta.outputs.json).labels["org.opencontainers.image.revision"] }}
META_SOURCE=${{ fromJSON(steps.meta.outputs.json).labels["org.opencontainers.image.source"] }}
META_VERSION=${{ fromJSON(steps.meta.outputs.json).labels['org.opencontainers.image.version'] }}
META_VERSION_HASH=${{ fromJSON(steps.meta.outputs.json).labels['org.opencontainers.image.revision'] }}
META_SOURCE=${{ fromJSON(steps.meta.outputs.json).labels['org.opencontainers.image.source'] }}

0 comments on commit 719f642

Please sign in to comment.