From bf8a4a338f04d30b5166b57f306db286c4c707f9 Mon Sep 17 00:00:00 2001
From: Joe Carstairs <me@joeac.net>
Date: Sat, 25 Apr 2026 10:07:24 +0100
Subject: moves capsule/Dockerfile to capsule.Dockerfile

---
 capsule.Dockerfile | 44 ++++++++++++++++++++++++++++++++++++++++++++
 capsule/Dockerfile | 44 --------------------------------------------
 compose.yml        |  3 ++-
 3 files changed, 46 insertions(+), 45 deletions(-)
 create mode 100644 capsule.Dockerfile
 delete mode 100644 capsule/Dockerfile

diff --git a/capsule.Dockerfile b/capsule.Dockerfile
new file mode 100644
index 0000000..4243330
--- /dev/null
+++ b/capsule.Dockerfile
@@ -0,0 +1,44 @@
+FROM alpine:3.23 AS agate
+RUN apk --update --no-cache add rust cargo \
+  && wget -O - https://github.com/mbrubeck/agate/archive/refs/tags/v3.3.20.tar.gz | tar -xz \
+  && cargo install --path agate-3.3.20/ \
+  && apk del rust cargo \
+  && rm -rf agate-3.3.20 agate-target
+
+FROM alpine:3.23 AS comitium
+RUN apk --no-cache add make go scdoc
+RUN wget -O - https://git.sr.ht/~nytpu/comitium/archive/v1.8.2.tar.gz | tar -xz \
+  && make --directory=comitium-v1.8.2 \
+  && mv comitium-v1.8.2/build/comitium /usr/local/bin/comitium \
+  && apk del make go scdoc \
+  && rm -rf comitium-v1.8.2
+
+FROM alpine:3.23 AS final
+RUN mkdir -p /var/app/content
+WORKDIR /var/app
+COPY capsule/.certificates .certificates
+RUN crontab -l > crontab.tmp \
+  && echo "0 */6 * * * /usr/local/bin/comitium refresh --data /var/app/comitium-data" >> crontab.tmp \
+  && crontab crontab.tmp \
+  && rm crontab.tmp
+
+# bash is needed to run build_loglog.bash
+# busybox-openrc provides rc-service, which runs crond
+# gcc is a dependency for agate
+RUN apk --no-cache add bash busybox-openrc gcc
+RUN rc-update add crond
+COPY --from=agate /root/.cargo/bin/agate /usr/local/bin/agate
+COPY --from=comitium /usr/local/bin/comitium /usr/local/bin/comitium
+
+COPY capsule/comitium-data comitium-data
+COPY capsule/feeds.txt feeds.txt
+RUN while read feed; do \
+  comitium add --data comitium-data/ "$feed"; \
+  done <feeds.txt
+COPY capsule .
+RUN ./build_microlog.bash
+RUN ./build_loglog.bash
+
+CMD \
+  ( ( sleep 5; comitium refresh --data comitium-data/ ) & ) \
+  && agate --content content/ --addr [::]:1965 --addr 0.0.0.0:1965 --lang en-GB
diff --git a/capsule/Dockerfile b/capsule/Dockerfile
deleted file mode 100644
index fac4110..0000000
--- a/capsule/Dockerfile
+++ /dev/null
@@ -1,44 +0,0 @@
-FROM alpine:3.23 AS agate
-RUN apk --update --no-cache add rust cargo \
-  && wget -O - https://github.com/mbrubeck/agate/archive/refs/tags/v3.3.20.tar.gz | tar -xz \
-  && cargo install --path agate-3.3.20/ \
-  && apk del rust cargo \
-  && rm -rf agate-3.3.20 agate-target
-
-FROM alpine:3.23 AS comitium
-RUN apk --no-cache add make go scdoc
-RUN wget -O - https://git.sr.ht/~nytpu/comitium/archive/v1.8.2.tar.gz | tar -xz \
-  && make --directory=comitium-v1.8.2 \
-  && mv comitium-v1.8.2/build/comitium /usr/local/bin/comitium \
-  && apk del make go scdoc \
-  && rm -rf comitium-v1.8.2
-
-FROM alpine:3.23 AS final
-RUN mkdir -p /var/app/content
-WORKDIR /var/app
-COPY .certificates .certificates
-RUN crontab -l > crontab.tmp \
-  && echo "0 */6 * * * /usr/local/bin/comitium refresh --data /var/app/comitium-data" >> crontab.tmp \
-  && crontab crontab.tmp \
-  && rm crontab.tmp
-
-# bash is needed to run build_loglog.bash
-# busybox-openrc provides rc-service, which runs crond
-# gcc is a dependency for agate
-RUN apk --no-cache add bash busybox-openrc gcc
-RUN rc-update add crond
-COPY --from=agate /root/.cargo/bin/agate /usr/local/bin/agate
-COPY --from=comitium /usr/local/bin/comitium /usr/local/bin/comitium
-
-COPY comitium-data comitium-data
-COPY feeds.txt feeds.txt
-RUN while read feed; do \
-  comitium add --data comitium-data/ "$feed"; \
-  done <feeds.txt
-COPY . .
-RUN ./build_microlog.bash
-RUN ./build_loglog.bash
-
-CMD \
-  ( ( sleep 5; comitium refresh --data comitium-data/ ) & ) \
-  && agate --content content/ --addr [::]:1965 --addr 0.0.0.0:1965 --lang en-GB
diff --git a/compose.yml b/compose.yml
index 8097829..f5c99f0 100644
--- a/compose.yml
+++ b/compose.yml
@@ -1,7 +1,8 @@
 services:
   capsule:
     build:
-      context: capsule
+      context: .
+      dockerfile: capsule.Dockerfile
     ports:
       - "1965:1965"
 
-- 
cgit v1.2.3