Skip to content

Commit a12fad4

Browse files
authored
Merge branch 'main' into fix-logger-new
2 parents caa113f + c9bd90c commit a12fad4

File tree

6 files changed

+57
-57
lines changed

6 files changed

+57
-57
lines changed

.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ jobs:
8282

8383
- name: Authenticate to Google Cloud
8484
id: auth
85-
uses: google-github-actions/auth@6fc4af4b145ae7821d527454aa9bd537d1f2dc5f # v2.1.7
85+
uses: google-github-actions/auth@71f986410dfbc7added4569d411d040a91dc6935 # v2.1.8
8686
with:
8787
token_format: access_token
8888
workload_identity_provider: ${{ secrets.GCP_WORKLOAD_IDENTITY }}

.github/workflows/nfr.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,14 +86,14 @@ jobs:
8686

8787
- name: Authenticate to Google Cloud
8888
id: auth
89-
uses: google-github-actions/auth@6fc4af4b145ae7821d527454aa9bd537d1f2dc5f # v2.1.7
89+
uses: google-github-actions/auth@71f986410dfbc7added4569d411d040a91dc6935 # v2.1.8
9090
with:
9191
token_format: access_token
9292
workload_identity_provider: ${{ secrets.GCP_WORKLOAD_IDENTITY }}
9393
service_account: ${{ secrets.GCP_SERVICE_ACCOUNT }}
9494

9595
- name: Set up Cloud SDK
96-
uses: google-github-actions/setup-gcloud@6189d56e4096ee891640bb02ac264be376592d6a # v2.1.2
96+
uses: google-github-actions/setup-gcloud@77e7a554d41e2ee56fc945c52dfd3f33d12def9a # v2.1.4
9797
with:
9898
project_id: ${{ secrets.GCP_PROJECT_ID }}
9999
install_components: kubectl

build/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ RUN make build
1111

1212
FROM golang:1.23 AS ca-certs-provider
1313

14-
FROM alpine:3.20 AS capabilizer
14+
FROM alpine:3.21 AS capabilizer
1515
RUN apk add --no-cache libcap
1616

1717
FROM capabilizer AS local-capabilizer

build/Dockerfile.nginxplus

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ FROM scratch AS nginx-files
55
ADD --link --chown=101:1001 https://cs.nginx.com/static/keys/nginx_signing.rsa.pub nginx_signing.rsa.pub
66

77

8-
FROM alpine:3.20
8+
FROM alpine:3.21
99

1010
ARG NGINX_PLUS_VERSION=R33
1111
ARG NJS_DIR

internal/mode/static/nginx/modules/package-lock.json

Lines changed: 50 additions & 50 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

internal/mode/static/nginx/modules/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@
1010
"clean": "rm -rf node_modules coverage"
1111
},
1212
"devDependencies": {
13-
"@vitest/coverage-v8": "^3.0.4",
13+
"@vitest/coverage-v8": "^3.0.5",
1414
"prettier": "3.4.2",
15-
"vitest": "^3.0.4"
15+
"vitest": "^3.0.5"
1616
},
1717
"type": "module"
1818
}

0 commit comments

Comments
 (0)