From 2223da5e340b7af4d1d9a4fd66c03ed5f5a6291a Mon Sep 17 00:00:00 2001 From: Jason Robinson Date: Wed, 20 Apr 2022 16:44:05 +0300 Subject: [PATCH 1/3] Set Dockerfile version The Synapse Dockerfile uses Buildkit and some GitLab CI environments at least seem to be confused about the extra arguments to some Dockerfile commands, if the version is not defined. Docs: https://docs.docker.com/develop/develop-images/build_enhancements/#overriding-default-frontends Signed-off-by: Jason Robinson --- changelog.d/12541.misc | 1 + docker/Dockerfile | 1 + 2 files changed, 2 insertions(+) create mode 100644 changelog.d/12541.misc diff --git a/changelog.d/12541.misc b/changelog.d/12541.misc new file mode 100644 index 000000000000..81fa738b60b7 --- /dev/null +++ b/changelog.d/12541.misc @@ -0,0 +1 @@ +Define Dockerfile version to fix issues with building images in some GitLab CI environments due to Buildkite. diff --git a/docker/Dockerfile b/docker/Dockerfile index 4523c60645bd..ccc6a9f77849 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,3 +1,4 @@ +# syntax=docker/dockerfile:1 # Dockerfile to build the matrixdotorg/synapse docker images. # # Note that it uses features which are only available in BuildKit - see From 96107d37b572dcc274015a173670ca18fbc5e7b8 Mon Sep 17 00:00:00 2001 From: Jason Robinson Date: Tue, 26 Apr 2022 08:36:47 +0300 Subject: [PATCH 2/3] Update changelog.d/12541.misc Co-authored-by: David Robertson --- changelog.d/12541.misc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changelog.d/12541.misc b/changelog.d/12541.misc index 81fa738b60b7..c3b9c31657cd 100644 --- a/changelog.d/12541.misc +++ b/changelog.d/12541.misc @@ -1 +1 @@ -Define Dockerfile version to fix issues with building images in some GitLab CI environments due to Buildkite. +Explicitly opt-in to using [BuildKit-specific features](https://github.com/moby/buildkit/blob/master/frontend/dockerfile/docs/syntax.md) in the Dockerfile. This fixes issues with building images in some GitLab CI environments. From 3ee89962a5150ed147edb3694d5c4ab9ffb407ca Mon Sep 17 00:00:00 2001 From: Jason Robinson Date: Tue, 26 Apr 2022 08:37:51 +0300 Subject: [PATCH 3/3] Rename changelog .misc -> .docker Signed-off-by: Jason Robinson --- changelog.d/{12541.misc => 12541.docker} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename changelog.d/{12541.misc => 12541.docker} (100%) diff --git a/changelog.d/12541.misc b/changelog.d/12541.docker similarity index 100% rename from changelog.d/12541.misc rename to changelog.d/12541.docker