Move to running in a container

QuLogic · QuLogic · commit 7d6eb505589f · 2022-02-09T21:48:37.000-05:00
The Caddy in Fedora is old and buggy, unfortunately.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1 @@
+/sites/
diff --git a/Caddyfile b/Caddyfile
@@ -6,7 +6,7 @@
 	redir /{args.0} /{args.0}/ permanent
 
 	handle_path /{args.0}/* {
-		root * {args.0}
+		root * {$SITE_DIR:sites}/{args.0}
 		file_server
 	}
 }
@@ -26,15 +26,14 @@
 	# Place the brochure site at the top level.
 	import subproject mpl-brochure-site
 	@brochure file {
-		root mpl-brochure-site
-		try_files {path}
+		root {$SITE_DIR:sites}/mpl-brochure-site
 	}
 	rewrite / /mpl-brochure-site/index.html
 	rewrite @brochure /mpl-brochure-site{http.matchers.file.relative}
 
 	# Finally try any of the versioned docs.
 	handle {
-		root * matplotlib.github.com
+		root * {$SITE_DIR:sites}/matplotlib.github.com
 		file_server
 	}
 }
diff --git a/Makefile b/Makefile
@@ -0,0 +1,18 @@
+RUNTIME ?= podman
+CADDY_VERSION ?= 2.4.6
+
+serve:
+	mkdir -p sites
+	$(RUNTIME) run --rm -it \
+	    -v $$PWD/sites:/srv:Z \
+	    -v $$PWD/Caddyfile:/etc/caddy/Caddyfile:ro,Z \
+	    -e SITE_DIR=/srv \
+	    -p 2015:2015 \
+	    docker.io/library/caddy:$(CADDY_VERSION) \
+	    caddy run --config /etc/caddy/Caddyfile --watch
+
+fmt:
+	$(RUNTIME) run --rm -it \
+	    -v $$PWD/Caddyfile:/etc/caddy/Caddyfile:Z \
+	    docker.io/library/caddy:$(CADDY_VERSION) \
+	    caddy fmt --overwrite /etc/caddy/Caddyfile

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`redir /{args.0} /{args.0}/ permanent`
`7`	`7`
`8`	`8`	`handle_path /{args.0}/* {`
`9`		`- root * {args.0}`
	`9`	`+ root * {$SITE_DIR:sites}/{args.0}`
`10`	`10`	`file_server`
`11`	`11`	`}`
`12`	`12`	`}`
`@@ -26,15 +26,14 @@`
`26`	`26`	`# Place the brochure site at the top level.`
`27`	`27`	`import subproject mpl-brochure-site`
`28`	`28`	`@brochure file {`
`29`		`- root mpl-brochure-site`
`30`		`- try_files {path}`
	`29`	`+ root {$SITE_DIR:sites}/mpl-brochure-site`
`31`	`30`	`}`
`32`	`31`	`rewrite / /mpl-brochure-site/index.html`
`33`	`32`	`rewrite @brochure /mpl-brochure-site{http.matchers.file.relative}`
`34`	`33`
`35`	`34`	`# Finally try any of the versioned docs.`
`36`	`35`	`handle {`
`37`		`- root * matplotlib.github.com`
	`36`	`+ root * {$SITE_DIR:sites}/matplotlib.github.com`
`38`	`37`	`file_server`
`39`	`38`	`}`
`40`	`39`	`}`