Skip to content

Commit

Permalink
Merge branch 'refs/heads/master' into docker
Browse files Browse the repository at this point in the history
# Conflicts:
#	.github/workflows/docker-publish.yml
  • Loading branch information
tanhongit committed Jun 2, 2024
2 parents 571b018 + 161c3fa commit f8cd720
Showing 1 changed file with 6 additions and 1 deletion.
7 changes: 6 additions & 1 deletion .github/workflows/docker-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
name: Shellcheck
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Run ShellCheck
uses: ludeeus/action-shellcheck@master
with:
Expand Down Expand Up @@ -47,6 +47,11 @@ jobs:
uses: docker/metadata-action@v5
with:
images: ${{ env.DOCKER_USERNAME }}/${{ env.IMAGE_NAME }}
tags: |
type=ref,event=branch
type=ref,event=tag
type=semver,pattern={{version}}
latest=true # This ensures the 'latest' tag is always applied to the build
- name: Build and push Docker image
id: build-and-push
Expand Down

0 comments on commit f8cd720

Please sign in to comment.