Skip to content

Commit 92f32b5

Browse files
authored
ci: use latest stable dockerfile syntax & rename docs Dockerfile (docker#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 <[email protected]>
1 parent ca05ffe commit 92f32b5

File tree

5 files changed

+6
-6
lines changed

5 files changed

+6
-6
lines changed

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# syntax=docker/dockerfile:1.2
1+
# syntax=docker/dockerfile:1
22

33

44
# Copyright 2020 Docker Compose CLI authors

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ docs: ## generate documentation
9999
$(eval $@_TMP_OUT := $(shell mktemp -d -t dockercli-output.XXXXXXXXXX))
100100
docker build . \
101101
--output type=local,dest=$($@_TMP_OUT) \
102-
-f ./docs/docs.Dockerfile \
102+
-f ./docs/Dockerfile \
103103
--target update
104104
rm -rf ./docs/internal
105105
cp -R "$($@_TMP_OUT)"/out/* ./docs/
@@ -108,7 +108,7 @@ docs: ## generate documentation
108108
.PHONY: validate-docs
109109
validate-docs: ## validate the doc does not change
110110
@docker build . \
111-
-f ./docs/docs.Dockerfile \
111+
-f ./docs/Dockerfile \
112112
--target validate
113113

114114
.PHONY: check-dependencies

docs/docs.Dockerfile renamed to docs/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# syntax=docker/dockerfile:1.3-labs
1+
# syntax=docker/dockerfile:1
22

33

44
# Copyright 2020 Docker Compose CLI authors

pkg/e2e/fixtures/build-test/secrets/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# syntax=docker/dockerfile:1.2
1+
# syntax=docker/dockerfile:1
22

33

44
# Copyright 2020 Docker Compose CLI authors

pkg/e2e/fixtures/build-test/ssh/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# syntax=docker/dockerfile:1.2
1+
# syntax=docker/dockerfile:1
22

33

44
# Copyright 2020 Docker Compose CLI authors

0 commit comments

Comments
 (0)