summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoe Carstairs <me@joeac.net>2026-04-25 10:07:24 +0100
committerJoe Carstairs <me@joeac.net>2026-04-25 10:07:24 +0100
commitbf8a4a338f04d30b5166b57f306db286c4c707f9 (patch)
treeb50287022777bc20dccfd7c06327207c3831b7e3
parente8ef355d0ec02a6bb5ad84ab61ad7aba329a4b54 (diff)
moves capsule/Dockerfile to capsule.Dockerfile
-rw-r--r--capsule.Dockerfile (renamed from capsule/Dockerfile)8
-rw-r--r--compose.yml3
2 files changed, 6 insertions, 5 deletions
diff --git a/capsule/Dockerfile b/capsule.Dockerfile
index fac4110..4243330 100644
--- a/capsule/Dockerfile
+++ b/capsule.Dockerfile
@@ -16,7 +16,7 @@ RUN wget -O - https://git.sr.ht/~nytpu/comitium/archive/v1.8.2.tar.gz | tar -xz
FROM alpine:3.23 AS final
RUN mkdir -p /var/app/content
WORKDIR /var/app
-COPY .certificates .certificates
+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 \
@@ -30,12 +30,12 @@ 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
+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 . .
+COPY capsule .
RUN ./build_microlog.bash
RUN ./build_loglog.bash
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"