Merge branch 'main' into chore/remove-dependabot

nginx · Aug 23, 2024 · 60d2a23 · 60d2a23
2 parents 8af7f87 + 9bc583e
commit 60d2a23
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -79,7 +79,7 @@ jobs:
             OPENSSL_VERSION=${{ matrix.openssl_version }}
 
       - name: Run Grype vulnerability scanner
-        uses: anchore/scan-action@bc9adf64917dd9444d6cf4dd68620c34ca3a5f69 # v4.1.1
+        uses: anchore/scan-action@64a33b277ea7a1215a3c142735a1091341939ff5 # v4.1.2
         continue-on-error: true
         id: scan
         with:
@@ -88,7 +88,7 @@ jobs:
           add-cpes-if-none: true
 
       - name: Upload Anchore scan SARIF report
-        uses: github/codeql-action/upload-sarif@883d8588e56d1753a8a58c1c86e88976f0c23449 # v3.26.3
+        uses: github/codeql-action/upload-sarif@f0f3afee809481da311ca3a6ff1ff51d81dbeb24 # v3.26.4
         with:
           sarif_file: ${{ steps.scan.outputs.sarif }}
 

diff --git a/.github/workflows/scorecards.yml b/.github/workflows/scorecards.yml
@@ -56,6 +56,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@883d8588e56d1753a8a58c1c86e88976f0c23449 # v3.26.3
+        uses: github/codeql-action/upload-sarif@f0f3afee809481da311ca3a6ff1ff51d81dbeb24 # v3.26.4
         with:
           sarif_file: results.sarif
diff --git a/Dockerfile b/Dockerfile
@@ -1,8 +1,8 @@
-# syntax=docker/dockerfile:1.6
-ARG BUILD_OS=alpine:3.19
+# syntax=docker/dockerfile:1.9
+ARG BUILD_OS=alpine:3.20
 ARG OPENSSL_VERSION=3.0.9
 
-FROM ${BUILD_OS} as alpine
+FROM ${BUILD_OS} AS alpine
 ARG OPENSSL_VERSION
 
 RUN apk add --no-cache --virtual .build-deps \