Skip to content

Commit 8c182cc

Browse files
Update Dockerfile syntax to docker/dockerfile:1 (#3534)
chore: Update Dockerfile syntax to docker/dockerfile:1 Replace docker/dockerfile-upstream:1.4.0 with docker/dockerfile:1 across all Dockerfiles, templates, test data, and documentation. - Update DefaultDockerfileSyntax constant - Update buildkit templates - Update test data Dockerfiles - Update documentation examples Signed-off-by: Kim Christensen <[email protected]>
1 parent b17e579 commit 8c182cc

12 files changed

+13
-13
lines changed

docs/content/docs/bundle/custom-dockerfile.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ Sometimes you may want to full control over your bundle image, for example to in
1212
When you run porter create, a template Dockerfile is created for you in the current directory named **template.Dockerfile**:
1313

1414
```Dockerfile
15-
# syntax=docker/dockerfile-upstream:1.4.0
15+
# syntax=docker/dockerfile:1
1616
# This is a template Dockerfile for the bundle image
1717
# You can customize it to use different base images, install tools and copy configuration files.
1818
#
@@ -86,7 +86,7 @@ Porter automatically builds with Docker [buildkit] enabled.
8686
The following docker flags are supported on the [porter build] command: \--ssh, \--secret, \--build-arg.
8787
With these you can take advantage of Docker's support for using SSH connections, mounting secrets, and specifying custom build arguments.
8888

89-
By default, Porter uses the [1.4.0 dockerfile syntax](https://docs.docker.com/engine/reference/builder/#syntax), but you can modify this line to use new versions as they are released.
89+
By default, Porter uses the [dockerfile:1 syntax](https://docs.docker.com/engine/reference/builder/#syntax), but you can modify this line to use new versions as they are released.
9090

9191
[buildkit]: https://docs.docker.com/develop/develop-images/build_enhancements/
9292
[porter build]: /cli/porter_build/

pkg/build/buildkit/testdata/custom-build-arg.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# syntax=docker/dockerfile-upstream:1.4.0
1+
# syntax=docker/dockerfile:1
22
FROM --platform=linux/amd64 debian:stable-slim
33

44
# PORTER_INIT

pkg/build/buildkit/testdata/template.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# syntax=docker/dockerfile-upstream:1.4.0
1+
# syntax=docker/dockerfile:1
22
FROM --platform=linux/amd64 debian:stable-slim
33

44
# PORTER_INIT

pkg/build/dockerfile-generator.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ const (
2424
// DefaultDockerfileSyntax is the default syntax for Dockerfiles used by Porter
2525
// either when generating a Dockerfile from scratch, or when a template does
2626
// not define a syntax
27-
DefaultDockerfileSyntax = "docker/dockerfile-upstream:1.4.0"
27+
DefaultDockerfileSyntax = "docker/dockerfile:1"
2828
)
2929

3030
type DockerfileGenerator struct {

pkg/build/testdata/buildkit.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# syntax=docker/dockerfile-upstream:1.4.0
1+
# syntax=docker/dockerfile:1
22
FROM --platform=linux/amd64 debian:stable-slim
33

44
ARG BUNDLE_DIR

pkg/build/testdata/custom-dockerfile-expected-output.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# syntax=docker/dockerfile-upstream:1.4.0
1+
# syntax=docker/dockerfile:1
22
FROM ubuntu:latest
33
# stuff
44
ARG BUNDLE_DIR

pkg/build/testdata/custom-dockerfile-without-init-expected-output.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# syntax=docker/dockerfile-upstream:1.4.0
1+
# syntax=docker/dockerfile:1
22
FROM ubuntu:latest
33
ARG BUNDLE_DIR
44
ARG BUNDLE_UID=65532

pkg/build/testdata/missing-args-expected-output.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# syntax=docker/dockerfile-upstream:1.4.0
1+
# syntax=docker/dockerfile:1
22
FROM ubuntu:latest
33
ARG BUNDLE_DIR
44
ARG BUNDLE_UID=65532

pkg/build/testdata/missing-mixins-token-expected-output.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# syntax=docker/dockerfile-upstream:1.4.0
1+
# syntax=docker/dockerfile:1
22
FROM ubuntu:light
33
ARG BUNDLE_DIR
44
ARG BUNDLE_UID=65532

pkg/templates/templates/build/buildkit.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# syntax=docker/dockerfile-upstream:1.4.0
1+
# syntax=docker/dockerfile:1
22
FROM --platform=linux/amd64 debian:stable-slim
33

44
# PORTER_INIT

0 commit comments

Comments
 (0)