Skip to content

Commit cc31754

Browse files
committed
Merge branch 'main' into chore/module-dir
2 parents 58eeb65 + ea42305 commit cc31754

File tree

7 files changed

+7
-7
lines changed

7 files changed

+7
-7
lines changed

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.18
1+
# syntax=docker/dockerfile:1.19
22
FROM golang:1.25 AS builder
33

44
WORKDIR /go/src/github.com/nginx/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.18
1+
# syntax=docker/dockerfile:1.19
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>

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.18
1+
# syntax=docker/dockerfile:1.19
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.18
1+
# syntax=docker/dockerfile:1.19
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.25-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.18
1+
# syntax=docker/dockerfile:1.19
22
FROM golang:1.25
33

44
WORKDIR /go/src/github.com/nginx/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.18
1+
# syntax=docker/dockerfile:1.19
22
FROM golang:1.25-alpine AS builder
33

44
WORKDIR /

tests/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ go 1.24.2
55
replace github.com/nginx/nginx-gateway-fabric/v2 => ../
66

77
require (
8-
github.com/nginx/nginx-gateway-fabric/v2 v2.1.1
8+
github.com/nginx/nginx-gateway-fabric/v2 v2.1.4
99
github.com/onsi/ginkgo/v2 v2.25.3
1010
github.com/onsi/gomega v1.38.2
1111
github.com/prometheus/client_golang v1.23.2

0 commit comments

Comments
 (0)