From d1fe3b1cf6d2a650d27b9f37984fdde36f41c979 Mon Sep 17 00:00:00 2001 From: Tim Bannister Date: Fri, 17 Jun 2022 12:26:36 +0100 Subject: [PATCH 1/2] Bump to Hugo 0.101.0 Notable improvements: - Indentation fixes for shortcode blocks - resources.Copy function - improved error handling --- netlify.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/netlify.toml b/netlify.toml index dc4b3e7042..e705fa5436 100644 --- a/netlify.toml +++ b/netlify.toml @@ -8,7 +8,7 @@ command = "git submodule update --init --recursive --depth 1 && make non-product [build.environment] NODE_VERSION = "10.20.0" -HUGO_VERSION = "0.97.0" +HUGO_VERSION = "0.101.0" RUBY_VERSION = "3.0.1" [context.production.environment] From 100aff90d74ab0d25dbfa80e570b620be5e511fe Mon Sep 17 00:00:00 2001 From: Tim Bannister Date: Fri, 17 Jun 2022 12:30:10 +0100 Subject: [PATCH 2/2] Don't lock source when building in a container The container build process can work independently of the source, so no locking is required. (this also fixes unprivileged container builds) --- Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 4d99f64b12..4b3ca99864 100644 --- a/Makefile +++ b/Makefile @@ -77,8 +77,9 @@ container-push: container-image ## Push container image for the preview of the w container-build: module-check $(CONTAINER_RUN) --read-only --mount type=tmpfs,destination=/tmp,tmpfs-mode=01777 $(CONTAINER_IMAGE) sh -c "npm ci && hugo --minify --environment development" +# no build lock to allow for read-only mounts container-serve: module-check ## Boot the development server using container. - $(CONTAINER_RUN) --cap-drop=ALL --cap-add=AUDIT_WRITE --read-only --mount type=tmpfs,destination=/tmp,tmpfs-mode=01777 -p 1313:1313 $(CONTAINER_IMAGE) hugo server --buildFuture --environment development --bind 0.0.0.0 --destination /tmp/hugo --cleanDestinationDir + $(CONTAINER_RUN) --cap-drop=ALL --cap-add=AUDIT_WRITE --read-only --mount type=tmpfs,destination=/tmp,tmpfs-mode=01777 -p 1313:1313 $(CONTAINER_IMAGE) hugo server --buildFuture --environment development --bind 0.0.0.0 --destination /tmp/hugo --cleanDestinationDir --noBuildLock test-examples: scripts/test_examples.sh install