From 5af8a24a32c82ceb6e09981a112060f275e38212 Mon Sep 17 00:00:00 2001
From: Jake Walker <hi@jakew.me>
Date: Mon, 11 Nov 2024 19:30:28 +0000
Subject: [PATCH] Add matterbridge and caddy images

---
 .gitmodules             |  3 +++
 README.md               |  2 ++
 custom-caddy/Dockerfile | 12 ++++++++++++
 images.json             | 12 ++++++++++++
 matterbridge            |  1 +
 5 files changed, 30 insertions(+)
 create mode 100644 custom-caddy/Dockerfile
 create mode 160000 matterbridge

diff --git a/.gitmodules b/.gitmodules
index 4d83e7f..a19737f 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,6 @@
 [submodule "beeper_bridge-manager"]
 	path = beeper_bridge-manager
 	url = https://github.com/beeper/bridge-manager.git
+[submodule "matterbridge"]
+	path = matterbridge
+	url = https://github.com/42wim/matterbridge.git
diff --git a/README.md b/README.md
index 1062c90..45e42bf 100644
--- a/README.md
+++ b/README.md
@@ -7,6 +7,8 @@ These are some custom images that are regularly built for AMD64 and ARM64 archit
 | --- | --- |
 | `ghcr.io/jake-walker/beeper_bridge-manager` | This is an exact build of Beeper's [bridge-manager](https://github.com/beeper/bridge-manager) but with an ARM64 build. |
 | `ghcr.io/jake-walker/gitea-jupyter` | This is the default Gitea image with a Jupyter notebook renderer installed. [Extra configuration](https://blog.gitea.com/render-jupyter-notebooks/#configuring-gitea-to-use-the-converter) is required to enable this. |
+| `ghcr.io/jake-walker/matterbridge_whatsappmulti` | A build of the matterbridge WhatsApp multi image. |
+| `ghcr.io/jake-walker/custom-caddy` | A custom build of Caddy with the plugins: [WebDAV](https://github.com/mholt/caddy-webdav), [replace_response handler](https://github.com/caddyserver/replace-response), [cloudflare](https://github.com/caddy-dns/cloudflare). |
 <!-- generate end -->
 
 _Images are also available on Docker Hub at `jakewalker/<image name>`._
diff --git a/custom-caddy/Dockerfile b/custom-caddy/Dockerfile
new file mode 100644
index 0000000..39c953d
--- /dev/null
+++ b/custom-caddy/Dockerfile
@@ -0,0 +1,12 @@
+ARG CADDY_VERSION=latest
+
+FROM caddy:${CADDY_VERSION}-builder AS builder
+
+RUN xcaddy build \
+        --with github.com/mholt/caddy-webdav \
+        --with github.com/caddyserver/replace-response \
+        --with github.com/caddy-dns/cloudflare
+
+FROM caddy:${CADDY_VERSION}-alpine
+
+COPY --from=builder /usr/bin/caddy /usr/bin/caddy
diff --git a/images.json b/images.json
index 21b303b..c621281 100644
--- a/images.json
+++ b/images.json
@@ -10,5 +10,17 @@
     "context": "./gitea-jupyter",
     "dockerfile": "./gitea-jupyter/Dockerfile",
     "description": "This is the default Gitea image with a Jupyter notebook renderer installed. [Extra configuration](https://blog.gitea.com/render-jupyter-notebooks/#configuring-gitea-to-use-the-converter) is required to enable this."
+  },
+  {
+    "name": "matterbridge_whatsappmulti",
+    "context": "./matterbridge",
+    "dockerfile": "./matterbridge/Dockerfile_whatsappmulti",
+    "description": "A build of the matterbridge WhatsApp multi image."
+  },
+  {
+    "name": "custom-caddy",
+    "context": "./custom-caddy",
+    "dockerfile": "./custom-caddy/Dockerfile",
+    "description": "A custom build of Caddy with the plugins: [WebDAV](https://github.com/mholt/caddy-webdav), [replace_response handler](https://github.com/caddyserver/replace-response), [cloudflare](https://github.com/caddy-dns/cloudflare)."
   }
 ]
diff --git a/matterbridge b/matterbridge
new file mode 160000
index 0000000..c4157a4
--- /dev/null
+++ b/matterbridge
@@ -0,0 +1 @@
+Subproject commit c4157a4d5b49fce79c80a30730dc7c404bacd663