Skip to content

Commit 0bc3bd9

Browse files
authored
Merge branch 'main' into renovate/nginx-1.x
2 parents 5d2775b + d78c2c9 commit 0bc3bd9

File tree

6 files changed

+6
-6
lines changed

6 files changed

+6
-6
lines changed

Diff for: build/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# syntax=docker/dockerfile:1.14
1+
# syntax=docker/dockerfile:1.15
22
FROM golang:1.24 AS builder
33

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

Diff for: build/Dockerfile.nginx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# syntax=docker/dockerfile:1.14
1+
# syntax=docker/dockerfile:1.15
22
FROM nginx:1.27.5-alpine-otel
33

44
ARG NJS_DIR

Diff for: build/Dockerfile.nginxplus

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# syntax=docker/dockerfile:1.14
1+
# syntax=docker/dockerfile:1.15
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>

Diff for: debug/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# syntax=docker/dockerfile:1.14
1+
# syntax=docker/dockerfile:1.15
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

Diff for: tests/conformance/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# syntax=docker/dockerfile:1.14
1+
# syntax=docker/dockerfile:1.15
22
FROM golang:1.24
33

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

Diff for: tests/framework/crossplane/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# syntax=docker/dockerfile:1.14
1+
# syntax=docker/dockerfile:1.15
22
FROM golang:1.24-alpine AS builder
33

44
WORKDIR /

0 commit comments

Comments
 (0)