Skip to content

Commit 3e2596b

Browse files
committed
Merge remote-tracking branch 'origin/main' into upgrade/sts/3008.0
2 parents 1b6434d + 617cc00 commit 3e2596b

3 files changed

Lines changed: 9 additions & 9 deletions

File tree

.github/workflows/build-and-test.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ jobs:
9696
--name registry registry:2
9797
9898
- name: Build docker-salt-master Base Image
99-
uses: docker/build-push-action@v7
99+
uses: docker/build-push-action@v7.1.0
100100
with:
101101
file: ./Dockerfile
102102
platforms: linux/amd64,linux/arm64
@@ -110,7 +110,7 @@ jobs:
110110
cache-to: type=gha,mode=max,scope=build-and-test-base
111111

112112
- name: Build docker-salt-master SaltGUI Image
113-
uses: docker/build-push-action@v7
113+
uses: docker/build-push-action@v7.1.0
114114
with:
115115
file: ./Dockerfile.gui
116116
platforms: linux/amd64,linux/arm64

.github/workflows/publish.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -99,20 +99,20 @@ jobs:
9999
uses: docker/setup-buildx-action@v4
100100

101101
- name: Login to Docker Container Registry
102-
uses: docker/login-action@v4
102+
uses: docker/login-action@v4.1.0
103103
with:
104104
username: ${{ github.repository_owner }}
105105
password: ${{ secrets.DOCKER_PASSWORD }}
106106

107107
- name: Login to GitHub Container Registry
108-
uses: docker/login-action@v4
108+
uses: docker/login-action@v4.1.0
109109
with:
110110
registry: ghcr.io
111111
username: ${{ github.repository_owner }}
112112
password: ${{ secrets.CR_PAT }}
113113

114114
- name: Login to Quay.io Container Registry
115-
uses: docker/login-action@v4
115+
uses: docker/login-action@v4.1.0
116116
with:
117117
registry: quay.io
118118
username: ${{ secrets.QUAYIO_USERNAME }}
@@ -131,7 +131,7 @@ jobs:
131131
registry-type: public
132132

133133
- name: Build and Publish Base Image
134-
uses: docker/build-push-action@v7
134+
uses: docker/build-push-action@v7.1.0
135135
with:
136136
context: .
137137
file: ./Dockerfile
@@ -149,7 +149,7 @@ jobs:
149149
tags: ${{ needs.metadata.outputs.tags }}
150150

151151
- name: Build and Publish SaltGUI Image
152-
uses: docker/build-push-action@v7
152+
uses: docker/build-push-action@v7.1.0
153153
with:
154154
context: .
155155
file: ./Dockerfile.gui

.github/workflows/security-analysis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ jobs:
8686
uses: docker/setup-buildx-action@v4
8787

8888
- name: Build docker-salt-master Base Image
89-
uses: docker/build-push-action@v7
89+
uses: docker/build-push-action@v7.1.0
9090
with:
9191
context: .
9292
file: ./Dockerfile
@@ -110,6 +110,6 @@ jobs:
110110
severity: "CRITICAL,HIGH"
111111

112112
- name: Upload Trivy Scan Results to GitHub Security Tab
113-
uses: github/codeql-action/upload-sarif@v4.35.4
113+
uses: github/codeql-action/upload-sarif@v4.35.5
114114
with:
115115
sarif_file: "trivy-results.sarif"

0 commit comments

Comments
 (0)