From 40b1b403e8caae23f0564f4b407f54d9743be99e Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Fri, 21 Feb 2020 10:48:41 +0100 Subject: [PATCH 1/3] compose file: enable buildkit for building This adds a `.env` file to enable buildkit when using docker-compose to build the docs. Signed-off-by: Sebastiaan van Stijn --- .env | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 .env diff --git a/.env b/.env new file mode 100644 index 0000000000..eb273265f8 --- /dev/null +++ b/.env @@ -0,0 +1,2 @@ +COMPOSE_DOCKER_CLI_BUILD=1 +DOCKER_BUILDKIT=1 From 24c0299e4e93315f221d46c61a85643fa9d5c9a9 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Thu, 20 Feb 2020 16:46:50 +0100 Subject: [PATCH 2/3] compose file: disable archives by default Signed-off-by: Sebastiaan van Stijn --- docker-compose.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index f6e8fedd65..192b21e021 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -3,7 +3,8 @@ services: docs: build: context: . - dockerfile: Dockerfile + args: + - ENABLE_ARCHIVES=false image: docs/docstage ports: - "4000:4000" From ebc86d840af371d70c8851f96c4076559a741b77 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Fri, 21 Feb 2020 10:49:42 +0100 Subject: [PATCH 3/3] compose file: use v3 and no volume The current target didn't have jekyll installed, so mounting the source-files didn't do anything. This patch removes the bind-mount. Alternatively, we could switch back to using a jekyll stage (with automatic rebuilding). Signed-off-by: Sebastiaan van Stijn --- docker-compose.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 192b21e021..dcbf74bae5 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,4 +1,4 @@ -version: "2" +version: "3.7" services: docs: build: @@ -8,5 +8,3 @@ services: image: docs/docstage ports: - "4000:4000" - volumes: - - "./:/usr/src/app"