From 994d6b7fc2b09ca03d6b6fc75a9086e05bbdfaea Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Thu, 17 Mar 2022 10:37:08 +0100 Subject: [PATCH] Dockerfile: use syntax=docker/dockerfile:1 Now that HEREDOC is included in the stable Dockerfile syntax, we can use the latest stable syntax for all Dockerfiles. The recommendation for the stable syntax is to use `:1` (which is equivalent to "latest" stable syntax. Signed-off-by: Sebastiaan van Stijn --- Dockerfile | 2 +- dockerfiles/Dockerfile.authors | 2 +- dockerfiles/Dockerfile.dev | 2 +- dockerfiles/Dockerfile.lint | 2 +- dockerfiles/Dockerfile.shellcheck | 2 +- dockerfiles/Dockerfile.vendor | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index e6cba57ed5..2de3f38401 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -# syntax=docker/dockerfile:1.3 +# syntax=docker/dockerfile:1 ARG BASE_VARIANT=alpine ARG GO_VERSION=1.16.11 diff --git a/dockerfiles/Dockerfile.authors b/dockerfiles/Dockerfile.authors index 71cd1decbf..df7c30f5e1 100644 --- a/dockerfiles/Dockerfile.authors +++ b/dockerfiles/Dockerfile.authors @@ -1,4 +1,4 @@ -# syntax=docker/dockerfile:1.3-labs +# syntax=docker/dockerfile:1 FROM alpine:3.14 AS gen RUN apk add --no-cache bash git diff --git a/dockerfiles/Dockerfile.dev b/dockerfiles/Dockerfile.dev index 4e91921250..5ed8d4c85b 100644 --- a/dockerfiles/Dockerfile.dev +++ b/dockerfiles/Dockerfile.dev @@ -1,4 +1,4 @@ -# syntax=docker/dockerfile:1.3 +# syntax=docker/dockerfile:1 ARG GO_VERSION=1.16.11 diff --git a/dockerfiles/Dockerfile.lint b/dockerfiles/Dockerfile.lint index e04a059a8e..cc4c56b2c0 100644 --- a/dockerfiles/Dockerfile.lint +++ b/dockerfiles/Dockerfile.lint @@ -1,4 +1,4 @@ -# syntax=docker/dockerfile:1.3 +# syntax=docker/dockerfile:1 ARG GO_VERSION=1.16.11 ARG GOLANGCI_LINT_VERSION=v1.23.8 diff --git a/dockerfiles/Dockerfile.shellcheck b/dockerfiles/Dockerfile.shellcheck index 80ba2e4e94..6e5215c0b8 100644 --- a/dockerfiles/Dockerfile.shellcheck +++ b/dockerfiles/Dockerfile.shellcheck @@ -1,4 +1,4 @@ -# syntax=docker/dockerfile:1.3 +# syntax=docker/dockerfile:1 FROM koalaman/shellcheck-alpine:v0.7.1 AS shellcheck WORKDIR /go/src/github.com/docker/cli diff --git a/dockerfiles/Dockerfile.vendor b/dockerfiles/Dockerfile.vendor index 6d687c6378..ce66ba5228 100644 --- a/dockerfiles/Dockerfile.vendor +++ b/dockerfiles/Dockerfile.vendor @@ -1,4 +1,4 @@ -# syntax=docker/dockerfile:1.3-labs +# syntax=docker/dockerfile:1 ARG GO_VERSION=1.16.11 ARG MODOUTDATED_VERSION=v0.8.0