Merge branch 'main' into fix-logger-new

nginx · Feb 5, 2025 · a12fad4 · a12fad4
2 parents caa113f + c9bd90c
commit a12fad4
Show file tree

Hide file tree

Showing 6 changed files with 57 additions and 57 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -82,7 +82,7 @@ jobs:
 
       - name: Authenticate to Google Cloud
         id: auth
-        uses: google-github-actions/auth@6fc4af4b145ae7821d527454aa9bd537d1f2dc5f # v2.1.7
+        uses: google-github-actions/auth@71f986410dfbc7added4569d411d040a91dc6935 # v2.1.8
         with:
           token_format: access_token
           workload_identity_provider: ${{ secrets.GCP_WORKLOAD_IDENTITY }}

diff --git a/.github/workflows/nfr.yml b/.github/workflows/nfr.yml
@@ -86,14 +86,14 @@ jobs:
 
       - name: Authenticate to Google Cloud
         id: auth
-        uses: google-github-actions/auth@6fc4af4b145ae7821d527454aa9bd537d1f2dc5f # v2.1.7
+        uses: google-github-actions/auth@71f986410dfbc7added4569d411d040a91dc6935 # v2.1.8
         with:
           token_format: access_token
           workload_identity_provider: ${{ secrets.GCP_WORKLOAD_IDENTITY }}
           service_account: ${{ secrets.GCP_SERVICE_ACCOUNT }}
 
       - name: Set up Cloud SDK
-        uses: google-github-actions/setup-gcloud@6189d56e4096ee891640bb02ac264be376592d6a # v2.1.2
+        uses: google-github-actions/setup-gcloud@77e7a554d41e2ee56fc945c52dfd3f33d12def9a # v2.1.4
         with:
           project_id: ${{ secrets.GCP_PROJECT_ID }}
           install_components: kubectl

diff --git a/build/Dockerfile b/build/Dockerfile
@@ -11,7 +11,7 @@ RUN make build
 
 FROM golang:1.23 AS ca-certs-provider
 
-FROM alpine:3.20 AS capabilizer
+FROM alpine:3.21 AS capabilizer
 RUN apk add --no-cache libcap
 
 FROM capabilizer AS local-capabilizer

diff --git a/build/Dockerfile.nginxplus b/build/Dockerfile.nginxplus
@@ -5,7 +5,7 @@ FROM scratch AS nginx-files
 ADD --link --chown=101:1001 https://cs.nginx.com/static/keys/nginx_signing.rsa.pub nginx_signing.rsa.pub
 
 
-FROM alpine:3.20
+FROM alpine:3.21
 
 ARG NGINX_PLUS_VERSION=R33
 ARG NJS_DIR

diff --git a/internal/mode/static/nginx/modules/package-lock.json b/internal/mode/static/nginx/modules/package-lock.json
diff --git a/internal/mode/static/nginx/modules/package.json b/internal/mode/static/nginx/modules/package.json
@@ -10,9 +10,9 @@
     "clean": "rm -rf node_modules coverage"
   },
   "devDependencies": {
-    "@vitest/coverage-v8": "^3.0.4",
+    "@vitest/coverage-v8": "^3.0.5",
     "prettier": "3.4.2",
-    "vitest": "^3.0.4"
+    "vitest": "^3.0.5"
   },
   "type": "module"
 }