From 92f32b5c79fd3f6e59e48c365488c537fd1fa402 Mon Sep 17 00:00:00 2001
From: Sebastiaan van Stijn <thaJeztah@users.noreply.github.com>
Date: Wed, 3 Aug 2022 22:36:13 +0200
Subject: [PATCH] ci: use latest stable dockerfile syntax & rename docs
 Dockerfile (#9711)

* update dockerfiles to use latest stable syntax

Some Dockerfiles were pinned to a minor release, which meant they
wouldn't be updated to get the latest stable syntax (and fixes),
and one Dockerfile used the "labs" variant to use the HEREDOC syntax,
which has now been promoted to the stable syntax.

* docs: rename Dockerfile

There's no other Dockerfiles in the same path, so the "docs"
prefix was redundant.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
---
 Dockerfile                                     | 2 +-
 Makefile                                       | 4 ++--
 docs/{docs.Dockerfile => Dockerfile}           | 2 +-
 pkg/e2e/fixtures/build-test/secrets/Dockerfile | 2 +-
 pkg/e2e/fixtures/build-test/ssh/Dockerfile     | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)
 rename docs/{docs.Dockerfile => Dockerfile} (97%)

diff --git a/Dockerfile b/Dockerfile
index 69d350124..adfe3f965 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-# syntax=docker/dockerfile:1.2
+# syntax=docker/dockerfile:1
 
 
 #   Copyright 2020 Docker Compose CLI authors
diff --git a/Makefile b/Makefile
index ae17fa725..2556adbfb 100644
--- a/Makefile
+++ b/Makefile
@@ -99,7 +99,7 @@ docs: ## generate documentation
 	$(eval $@_TMP_OUT := $(shell mktemp -d -t dockercli-output.XXXXXXXXXX))
 	docker build . \
 	--output type=local,dest=$($@_TMP_OUT) \
-	-f ./docs/docs.Dockerfile \
+	-f ./docs/Dockerfile \
 	--target update
 	rm -rf ./docs/internal
 	cp -R "$($@_TMP_OUT)"/out/* ./docs/
@@ -108,7 +108,7 @@ docs: ## generate documentation
 .PHONY: validate-docs
 validate-docs: ## validate the doc does not change
 	@docker build . \
-	-f ./docs/docs.Dockerfile \
+	-f ./docs/Dockerfile \
 	--target validate
 
 .PHONY: check-dependencies
diff --git a/docs/docs.Dockerfile b/docs/Dockerfile
similarity index 97%
rename from docs/docs.Dockerfile
rename to docs/Dockerfile
index 504faefcb..b23217608 100644
--- a/docs/docs.Dockerfile
+++ b/docs/Dockerfile
@@ -1,4 +1,4 @@
-# syntax=docker/dockerfile:1.3-labs
+# syntax=docker/dockerfile:1
 
 
 #   Copyright 2020 Docker Compose CLI authors
diff --git a/pkg/e2e/fixtures/build-test/secrets/Dockerfile b/pkg/e2e/fixtures/build-test/secrets/Dockerfile
index a9bc1d7c0..5c2924e61 100644
--- a/pkg/e2e/fixtures/build-test/secrets/Dockerfile
+++ b/pkg/e2e/fixtures/build-test/secrets/Dockerfile
@@ -1,4 +1,4 @@
-# syntax=docker/dockerfile:1.2
+# syntax=docker/dockerfile:1
 
 
 #   Copyright 2020 Docker Compose CLI authors
diff --git a/pkg/e2e/fixtures/build-test/ssh/Dockerfile b/pkg/e2e/fixtures/build-test/ssh/Dockerfile
index 1a1831afa..d2fe8e5b8 100644
--- a/pkg/e2e/fixtures/build-test/ssh/Dockerfile
+++ b/pkg/e2e/fixtures/build-test/ssh/Dockerfile
@@ -1,4 +1,4 @@
-# syntax=docker/dockerfile:1.2
+# syntax=docker/dockerfile:1
 
 
 #   Copyright 2020 Docker Compose CLI authors