From 2d635ac0e7045663e22df1d4183ae4348f01d527 Mon Sep 17 00:00:00 2001
From: Alan Pearce
Date: Fri, 7 Jul 2023 20:14:19 +0200
Subject: Enable Caddyfile to validate without redis

Validation tries to connect to the redis server by the `storage` global
option, which is not possible without secrets that are not exposed
during the build
---
 .dockerignore   | 1 +
 Caddyfile       | 3 +--
 Dockerfile      | 5 +++++
 redis.Caddyfile | 2 ++
 4 files changed, 9 insertions(+), 2 deletions(-)
 create mode 100644 redis.Caddyfile

diff --git a/.dockerignore b/.dockerignore
index ee13087..dbb2ff0 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,3 +1,4 @@
 *
 !Caddyfile
+!redis.Caddyfile
 !public
diff --git a/Caddyfile b/Caddyfile
index b5d1b91..e5ca8f7 100644
--- a/Caddyfile
+++ b/Caddyfile
@@ -3,8 +3,7 @@
 	persist_config off
 	auto_https disable_redirects
 	acme_ca https://acme.zerossl.com/v2/DV90
-	storage redis {
-	}
+	import globals/*
 	servers :80 {
 		metrics
 		protocols h1 h2c
diff --git a/Dockerfile b/Dockerfile
index a963128..72dc719 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -16,4 +16,9 @@ COPY public /srv
 EXPOSE 9091/tcp
 
 ENV SITE_ROOT=/srv
+
+RUN mkdir /etc/caddy/globals/
+RUN touch /etc/caddy/globals/dummy
 RUN ["/usr/bin/caddy", "validate", "--config", "/etc/caddy/Caddyfile"]
+
+COPY redis.Caddyfile /etc/caddy/globals/redis
diff --git a/redis.Caddyfile b/redis.Caddyfile
new file mode 100644
index 0000000..c0f4bfc
--- /dev/null
+++ b/redis.Caddyfile
@@ -0,0 +1,2 @@
+storage redis {
+}
-- 
cgit 1.4.1