Skip to content

Commit f540dd0

Browse files
authored
Merge branch 'main' into feat/nginx-daemonset
2 parents 524bec1 + daa2e56 commit f540dd0

File tree

6 files changed

+6
-6
lines changed

6 files changed

+6
-6
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.15
1+
# syntax=docker/dockerfile:1.16
22
FROM golang:1.24 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.15
1+
# syntax=docker/dockerfile:1.16
22
# TODO(sberman): the commented out lines are for when we use the published agent release
33
# FROM scratch AS nginx-files
44

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.15
1+
# syntax=docker/dockerfile:1.16
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.15
1+
# syntax=docker/dockerfile:1.16
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.24-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.15
1+
# syntax=docker/dockerfile:1.16
22
FROM golang:1.24
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.15
1+
# syntax=docker/dockerfile:1.16
22
FROM golang:1.24-alpine AS builder
33

44
WORKDIR /

0 commit comments

Comments
 (0)