Skip to content

Commit

Permalink
Merge branch 'master' into latest
Browse files Browse the repository at this point in the history
  • Loading branch information
sni committed Jul 15, 2024
2 parents 1ae5a9f + c4507c6 commit 0cc5e40
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/latest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,15 +39,15 @@ jobs:
username: ${{ secrets.REGISTRY_USER }}
password: ${{ secrets.PTA }}
- name: Push to Docker Hub
uses: docker/build-push-action@v5
uses: docker/build-push-action@v6
with:
push: true
file: Dockerfile.${{ matrix.target }}
build-args: OMD_VERSION=${{ github.ref }}
tags: consol/${{ matrix.target }}:latest
platforms: linux/amd64,linux/arm64
- name: Build container image
uses: docker/build-push-action@v5
uses: docker/build-push-action@v6
with:
push: true
file: Dockerfile.${{ matrix.target }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/nightly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,15 +40,15 @@ jobs:
username: ${{ secrets.REGISTRY_USER }}
password: ${{ secrets.PTA }}
- name: Push to Docker Hub
uses: docker/build-push-action@v5
uses: docker/build-push-action@v6
with:
push: true
file: Dockerfile.${{ matrix.target }}
build-args: OMD_VERSION=${{ github.ref }}
tags: consol/${{ matrix.target }}:nightly
platforms: linux/amd64,linux/arm64
- name: Build container image
uses: docker/build-push-action@v5
uses: docker/build-push-action@v6
with:
push: true
file: Dockerfile.${{ matrix.target }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/releases.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,15 +40,15 @@ jobs:
username: ${{ secrets.REGISTRY_USER }}
password: ${{ secrets.PTA }}
- name: Push to Docker Hub
uses: docker/build-push-action@v5
uses: docker/build-push-action@v6
with:
push: true
file: Dockerfile.${{ matrix.target }}
build-args: OMD_VERSION=${{ env.BRANCH_NAME }}
tags: consol/${{ matrix.target }}:${{ env.BRANCH_NAME }}
platforms: linux/amd64,linux/arm64
- name: Build/Push to github.com
uses: docker/build-push-action@v5
uses: docker/build-push-action@v6
with:
push: true
file: Dockerfile.${{ matrix.target }}
Expand Down

0 comments on commit 0cc5e40

Please sign in to comment.