Skip to content

Commit 24720e9

Browse files
authored
Merge branch 'main' into issue-6679
2 parents 812e7ef + 5d85ad8 commit 24720e9

File tree

5 files changed

+7
-7
lines changed

5 files changed

+7
-7
lines changed

.github/workflows/docs-build-push.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ permissions:
3131

3232
jobs:
3333
call-docs-build-push:
34-
uses: nginxinc/docs-actions/.github/workflows/docs-build-push.yml@69843fb5d009e99750e50c23e90c23a899e4637e # v1.0.6
34+
uses: nginxinc/docs-actions/.github/workflows/docs-build-push.yml@9c59fab05a8131f4d691ba6ea2b6a119f3ef832a # v1.0.7
3535
permissions:
3636
pull-requests: write # needed to write preview url comment to PR
3737
contents: read

.pre-commit-config.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ repos:
5050
args: [--new-from-patch=/tmp/diff.patch]
5151

5252
- repo: https://github.com/asottile/pyupgrade
53-
rev: v3.17.0
53+
rev: v3.18.0
5454
hooks:
5555
- id: pyupgrade
5656

@@ -77,7 +77,7 @@ repos:
7777
]
7878

7979
- repo: https://github.com/python-jsonschema/check-jsonschema
80-
rev: 0.29.3
80+
rev: 0.29.4
8181
hooks:
8282
- id: check-jsonschema
8383
name: "Check Helm Chart JSON Schema"

build/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@ RUN --mount=type=bind,from=alpine-fips-3.17,target=/tmp/fips/ \
207207

208208

209209
############################################# Base image for Debian with NGINX Plus #############################################
210-
FROM debian:12-slim@sha256:ad86386827b083b3d71139050b47ffb32bbd9559ea9b1345a739b14fec2d9ecf AS debian-plus
210+
FROM debian:12-slim@sha256:a2500dba20ee82616f6ec13daa5a55f20bc63a2df5ce6082dacfba682b13b451 AS debian-plus
211211
ARG NGINX_PLUS_VERSION
212212

213213
ENV NGINX_VERSION=${NGINX_PLUS_VERSION}

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ require (
1818
github.com/nginxinc/nginx-prometheus-exporter v1.3.0
1919
github.com/nginxinc/nginx-service-mesh v1.7.0
2020
github.com/nginxinc/telemetry-exporter v0.1.2
21-
github.com/prometheus/client_golang v1.20.4
21+
github.com/prometheus/client_golang v1.20.5
2222
github.com/spiffe/go-spiffe/v2 v2.4.0
2323
github.com/stretchr/testify v1.9.0
2424
go.opentelemetry.io/otel v1.31.0

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -212,8 +212,8 @@ github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINE
212212
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
213213
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U=
214214
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
215-
github.com/prometheus/client_golang v1.20.4 h1:Tgh3Yr67PaOv/uTqloMsCEdeuFTatm5zIq5+qNN23vI=
216-
github.com/prometheus/client_golang v1.20.4/go.mod h1:PIEt8X02hGcP8JWbeHyeZ53Y/jReSnHgO035n//V5WE=
215+
github.com/prometheus/client_golang v1.20.5 h1:cxppBPuYhUnsO6yo/aoRol4L7q7UFfdm+bR9r+8l63Y=
216+
github.com/prometheus/client_golang v1.20.5/go.mod h1:PIEt8X02hGcP8JWbeHyeZ53Y/jReSnHgO035n//V5WE=
217217
github.com/prometheus/client_model v0.6.1 h1:ZKSh/rekM+n3CeS952MLRAdFwIKqeY8b62p8ais2e9E=
218218
github.com/prometheus/client_model v0.6.1/go.mod h1:OrxVMOVHjw3lKMa8+x6HeMGkHMQyHDk9E3jmP2AmGiY=
219219
github.com/prometheus/common v0.55.0 h1:KEi6DK7lXW/m7Ig5i47x0vRzuBsHuvJdi5ee6Y3G1dc=

0 commit comments

Comments
 (0)