Skip to content

Commit c8cf5ce

Browse files
authored
Merge branch 'main' into design/cp-dp-split
2 parents e83b8be + dd3892a commit c8cf5ce

File tree

7 files changed

+7
-7
lines changed

7 files changed

+7
-7
lines changed

.pre-commit-config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ repos:
3232
- id: gitleaks
3333

3434
- repo: https://github.com/rbubley/mirrors-prettier
35-
rev: v3.3.3
35+
rev: v3.4.1
3636
hooks:
3737
- id: prettier
3838
types:

build/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# syntax=docker/dockerfile:1.11
1+
# syntax=docker/dockerfile:1.12
22
FROM golang:1.23 AS builder
33

44
WORKDIR /go/src/github.com/nginxinc/nginx-gateway-fabric

build/Dockerfile.nginx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# syntax=docker/dockerfile:1.11
1+
# syntax=docker/dockerfile:1.12
22
FROM nginx:1.27.2-alpine-otel
33

44
ARG NJS_DIR

build/Dockerfile.nginxplus

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# syntax=docker/dockerfile:1.11
1+
# syntax=docker/dockerfile:1.12
22
FROM scratch AS nginx-files
33

44
# the following links can be replaced with local files if needed, i.e. ADD --chown=101:1001 <local_file> <container_file>

debug/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# syntax=docker/dockerfile:1.11
1+
# syntax=docker/dockerfile:1.12
22
# This Dockerfile builds an image with the dlv debugger. See the debugging guide in the developer docs for details
33
# on how to use it.
44
FROM golang:1.23-alpine AS builder

tests/conformance/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# syntax=docker/dockerfile:1.11
1+
# syntax=docker/dockerfile:1.12
22
FROM golang:1.23
33

44
WORKDIR /go/src/github.com/nginxinc/nginx-gateway-fabric/tests/conformance

tests/framework/crossplane/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# syntax=docker/dockerfile:1.11
1+
# syntax=docker/dockerfile:1.12
22
FROM golang:1.23-alpine AS builder
33

44
WORKDIR /

0 commit comments

Comments
 (0)