removed dnsmasq

Makefile

@@ -1,4 +1,4 @@
-images=agate archivebox ansible backup buku ddclient git-daemon gitolite gitolite-pystagit rss-bridge pleroma sassc syncthing tasks tor transmission vdirsyncer xandikos nfs-server dendrite
+images=agate archivebox ansible backup buku ddclient git-daemon gitolite gitolite-pystagit rss-bridge pleroma sassc syncthing tasks tor transmission vdirsyncer xandikos nfs-server dendrite rainloop monero filite
 
 .PHONY: all $(images)
 all: $(images)
@@ -64,3 +64,12 @@ xandikos:
 
 dendrite:
 	$(BUILD)
+
+rainloop:
+	$(BUILD)
+
+monero:
+	$(BUILD)
+
+filite:
+	$(BUILD)

README.md

@@ -24,12 +24,15 @@ useful.
 * buku: buku and bukuserver
 * ddclient
 * dendrite
+* filite
 * git-daemon: for git-daemon and git-http-backend
 * gitolite-pystagit: well, gitolite + pystagit
 * gitolite: gitolite + docker, so that I can mount the docker socket inside of
   it and have it do useful things through docker in response to triggers
+* monero
 * nfs-server
 * pleroma
+* rainloop
 * sassc
 * syncthing
 * tasks: intended to run a cron daemon to run arbitrary periodic tasks. I mount

agate/Dockerfile

@@ -1,4 +1,4 @@
-FROM alpine:3.13
+FROM alpine:3.16
 
 RUN apk add --no-cache --virtual .build-deps cargo && \
     apk add --no-cache libgcc && \

agate/Makefile

@@ -1,10 +1,19 @@
-USERNAME = rilla
+IMG_NAME=agate
-IMG_NAME = agate
+REGISTRY=registry.monotremata.xyz
+IMG=$(REGISTRY)/$(IMG_NAME)
+PLATFORMS=linux/amd64
 
-.PHONY: build build-nc
+.PHONY: build push buildx
 
 build: Dockerfile
-	docker build -t $(USERNAME)/$(IMG_NAME) .
+	docker build -t $(IMG) .
 
-build-nc: Dockerfile
+push: build
-	docker build --no-cache -t $(USERNAME)/$(IMG_NAME) .
+	docker image push $(IMG)
+
+buildx: Dockerfile
+	docker buildx build \
+		--platform $(PLATFORMS) \
+		--tag $(IMG) \
+		--push \
+		.

backup/Makefile

@@ -1,10 +1,15 @@
-USERNAME = rilla
 IMG_NAME = backup
+REGISTRY=registry.monotremata.xyz:443
 
-.PHONY: build build-nc
+IMG=$(REGISTRY)/$(IMG_NAME)
+
+.PHONY: build build-nc tag push
 
 build: Dockerfile make_backup.sh
-	docker build -t $(USERNAME)/$(IMG_NAME) .
+	docker build -t $(IMG) .
 
-build-nc: Dockerfile make_backup.sh
+push: build
-	docker build --no-cache -t $(USERNAME)/$(IMG_NAME) .
+	docker image push $(IMG)
+
+build-nc: Dockerfile docker-entrypoint.sh sshd_config
+	docker build --no-cache -t $(IMG)

filite/Dockerfile

@@ -0,0 +1,22 @@
+FROM alpine:3.13
+
+RUN apk add --no-cache --virtual .build-deps cargo && \
+    apk add --no-cache libgcc && \
+    cargo install filite && \
+    apk del .build-deps && \
+    mv /root/.cargo/bin/filite /usr/local/bin/filite && \
+    rm -r /root/.cargo && \
+    addgroup \
+        --gid 10001 \
+        filite && \
+    adduser \
+        --uid 10000 \
+        --home /var/lib/filite \
+        --ingroup filite \
+        --disabled-password \
+        --shell /sbin/nologin \
+        filite
+
+WORKDIR /var/lib/filite
+USER filite
+ENTRYPOINT ["/usr/local/bin/filite"]

filite/Makefile

@@ -0,0 +1,10 @@
+USERNAME = rilla
+IMG_NAME = filite
+
+.PHONY: build build-nc
+
+build: Dockerfile
+	docker build -t $(USERNAME)/$(IMG_NAME) .
+
+build-nc: Dockerfile
+	docker build --no-cache -t $(USERNAME)/$(IMG_NAME) .

gitolite/Dockerfile

@@ -1,4 +1,4 @@
-FROM alpine:3.12
+FROM alpine:3.14
 
 RUN apk add --update --no-cache \
         docker-compose \

gitolite/Makefile

@@ -1,10 +1,14 @@
-USERNAME = rilla
 IMG_NAME = gitolite
+REGISTRY=registry.monotremata.xyz:443
+IMG=$(REGISTRY)/$(IMG_NAME)
 
-.PHONY: build build-nc
+.PHONY: build build-nc push
 
 build: Dockerfile docker-entrypoint.sh sshd_config
-	docker build -t $(USERNAME)/$(IMG_NAME) .
+	docker build -t $(IMG) .
+
+push: build
+	docker image push $(IMG)
 
 build-nc: Dockerfile docker-entrypoint.sh sshd_config
-	docker build --no-cache -t $(USERNAME)/$(IMG_NAME) .
+	docker build --no-cache -t $(IMG) .

monero/Dockerfile

@@ -0,0 +1,26 @@
+FROM debian:bullseye-slim
+
+ARG ARCH
+ENV VER v0.17.2.3
+ENV URL "https://downloads.getmonero.org/cli/monero-linux-${ARCH}-${VER}.tar.bz2"
+
+RUN apt-get update && \
+    apt-get install -y curl bzip2 && \
+    rm -rf /var/lib/apt/lists/* && \
+    curl -o /root/monero.tar.bz2 "${URL}" && \
+    bzip2 -d /root/monero.tar.bz2 && \
+    tar -C /root -xf /root/monero.tar && \
+    find /root -type f -executable -exec cp {} /usr/local/bin \; && \
+    rm -r /root/monero*
+
+RUN groupadd --gid 10001 monero && \
+    useradd \
+        --uid 10000 \
+        --gid 10001 \
+        --shell /sbin/nologin \
+        --create-home \
+        --home-dir /var/lib/monero \
+        monero
+
+USER monero
+WORKDIR /var/lib/monero

monero/Makefile

@@ -0,0 +1,23 @@
+IMG_NAME = monero
+REGISTRY=registry.monotremata.xyz:443
+IMG=$(REGISTRY)/$(IMG_NAME)
+
+.PHONY: build build-nc push
+
+hw=$(shell uname -m)
+ifeq ($(hw), x86_64)
+	ARCH=x64
+else ifeq ($(hw), aarch64)
+	ARCH=armv8
+else
+	ARCH=$(hw)
+endif
+
+build: Dockerfile
+	docker build -t $(IMG) --build-arg ARCH=$(ARCH) .
+
+push: build
+	docker image push $(IMG)
+
+build-nc: Dockerfile
+	docker build --no-cache -t $(IMG) --build-arg ARCH=$(ARCH) .

mpd/Dockerfile

@@ -0,0 +1,67 @@
+FROM alpine:3.15
+
+RUN mkdir -p /var/lib/mpd && \
+    addgroup --gid 10001 mpd && \
+    adduser \
+        --uid 10000 \
+        --home /var/lib/mpd \
+        --ingroup mpd \
+        --disabled-password \
+        --shell /sbin/nologin \
+        mpd && \
+    chown -R mpd /var/lib/mpd && \
+    apk add --no-cache mpd
+
+USER mpd
+CMD ["/usr/bin/mpd", "--no-daemon"]
+
+
+#RUN apk add --no-cache --virtual .build-deps \
+#        curl \
+#        cmake \
+#        make \
+#        gcc \
+#        g++ \
+#        musl-dev \
+#        curl-dev \
+#        automake \
+#        autoconf \
+#        libtool && \
+#    mkdir -p /usr/local/src && \
+#    curl -L \
+#        --output "/usr/local/src/transmission-${VER}.tar.xz" \
+#        "https://github.com/transmission/transmission-releases/raw/master/transmission-${VER}.tar.xz" && \
+#    tar -xf "/usr/local/src/tranmission-${VER}.tar.xz" -C /usr/local/src && \
+#    mkdir -p /usr/local/src/transmission/build && \
+#    cd /usr/local/src/transmission/build && \
+#    cmake .. && \
+#    make && \
+#    make install && \
+#    cd / && \
+#    rm -r /usr/local/src && \
+#    apk del .build-deps && \
+#    apk add --no-cache curl
+
+#RUN addgroup \
+#        --gid 10001 \
+#        transmission && \
+#    adduser \
+#        --uid 10000 \
+#        --home /var/lib/transmission \
+#        --ingroup transmission \
+#        --disabled-password \
+#        --shell /sbin/nologin \
+#        transmission && \
+#    mkdir -p \
+#        /var/lib/transmission/blocklists \
+#        /var/lib/transmission/downloads \
+#        /var/lib/transmission/incomplete \
+#        /var/lib/transmission/resume \
+#        /var/lib/transmission/torrents && \
+#    chown -R transmission:transmission /var/lib/transmission
+
+#ENV TRANSMISSION_HOME /var/lib/transmission
+#USER transmission
+#WORKDIR /var/lib/transmission
+
+#CMD ["/usr/local/bin/transmission-daemon", "--foreground"]

mpd/Makefile

@@ -0,0 +1,22 @@
+IMG_NAME = mpd
+REGISTRY=registry.monotremata.xyz
+IMG=$(REGISTRY)/$(IMG_NAME)
+PLATFORMS=linux/amd64,linux/arm64
+
+.PHONY: build build-nc push
+
+build: Dockerfile
+	docker build -t $(IMG) .
+
+buildx: Dockerfile
+	docker buildx build \
+	    --platform $(PLATFORMS) \
+	    --tag $(IMG) \
+	    --push \
+	    .
+
+push: build
+	docker image push $(IMG)
+
+build-nc: Dockerfile
+	docker build --no-cache -t $(IMG) .

opensmtpd/Dockerfile

@@ -0,0 +1,15 @@
+FROM alpine:3.14
+
+RUN apk add --update --no-cache \
+        opensmtpd \
+        opensmtpd-extras \
+        rspamd \
+        opensmtpd-filter-rspamd && \
+    adduser \
+        -h /var/vmail \
+        -s /sbin/nologin \
+        -u 2000 \
+        -S -D \
+        vmail
+
+CMD ["smtpd", "-d"]

opensmtpd/Makefile

@@ -0,0 +1,10 @@
+USERNAME = rilla
+IMG_NAME = opensmtpd
+
+.PHONY: build build-nc
+
+build: Dockerfile
+	docker build -t $(USERNAME)/$(IMG_NAME) .
+
+build-nc: Dockerfile
+	docker build --no-cache -t $(USERNAME)/$(IMG_NAME) .

pleroma/Dockerfile

@@ -1,4 +1,4 @@
-FROM elixir:1.11.3-alpine as build
+FROM elixir:1.13-alpine as build
 
 ENV MIX_ENV=prod
 
@@ -13,22 +13,25 @@ RUN apk add \
     git clone \
         -b develop \
         https://git.pleroma.social/pleroma/pleroma.git \
-        /pleroma && \
+        /pleroma
-    echo "import Mix.Config" > /pleroma/config/prod.secret.exs && \
+
+RUN echo "import Mix.Config" > /pleroma/config/prod.secret.exs && \
     cd /pleroma && \
     mix local.hex --force && \
     mix local.rebar --force && \
     mix deps.get --only prod && \
+    mix deps.update gun && \
     mkdir -p /pleroma/release && \
     mix release --path release
 
-FROM alpine:3.13
+FROM alpine:3.16
 
 RUN apk add --update --no-cache \
         exiftool \
         imagemagick \
         libmagic \
         ncurses \
+	ffmpeg \
         postgresql-client && \
     addgroup \
         --gid 10001 \

pleroma/Makefile

@@ -1,10 +1,19 @@
-USERNAME = rilla
+IMG_NAME=pleroma
-IMG_NAME = pleroma
+REGISTRY=registry.monotremata.xyz
+IMG=$(REGISTRY)/$(IMG_NAME)
+PLATFORMS=linux/amd64
 
-.PHONY: build build-nc
+.PHONY: build buildx push
 
 build: Dockerfile entrypoint.sh
-	docker build -t $(USERNAME)/$(IMG_NAME) .
+	docker build -t $(IMG) .
 
-build-nc: Dockerfile entrypoint.sh
+push: build
-	docker build --no-cache -t $(USERNAME)/$(IMG_NAME) .
+	docker image push $(IMG)
+
+buildx: Dockerfile entrypoint.sh
+	docker buildx build \
+		--platform $(PLATFORMS) \
+		--tag $(IMG) \
+		--push \
+		.

rainloop/Dockerfile

@@ -0,0 +1,38 @@
+FROM alpine:3.14
+
+RUN apk add --no-cache \
+        nginx \
+        curl \
+        php7-fpm \
+        php7 \
+        php7-curl \
+        php7-iconv \
+        php7-json \
+	php7-openssl \
+        php7-dom && \
+    mkdir -p /var/www/rainloop && \
+    cd /var/www/rainloop && \
+    curl -sL https://repository.rainloop.net/installer.php | php && \
+    sed -i.bak 's/^listen = 127.0.0.1:9000/listen = 9000/' /etc/php7/php-fpm.d/www.conf && \
+    addgroup \
+        --gid 10001 \
+        rainloop && \
+    adduser \
+        --uid 10000 \
+        --home /var/www/rainloop \
+        --ingroup rainloop \
+        --disabled-password \
+        --shell /sbin/nologin \
+        rainloop && \
+    mkdir -p /run/nginx /var/run && \
+    touch /var/run/nginx.pid && \
+    chown -R rainloop:rainloop \
+        /var/www/rainloop \
+        /var/log/php7 \
+        /var/lib/nginx \
+        /var/log/nginx \
+        /run/nginx \
+	/var/run/nginx.pid
+
+USER rainloop
+WORKDIR /var/www/rainloop

rainloop/Makefile

@@ -0,0 +1,15 @@
+IMG_NAME = rainloop
+REGISTRY=registry.monotremata.xyz:443
+
+IMG=$(REGISTRY)/$(IMG_NAME)
+
+.PHONY: build build-nc push
+
+build: Dockerfile
+	docker build -t $(IMG) .
+
+push: build
+	docker image push $(IMG)
+
+build-nc: Dockerfile
+	docker build --no-cache -t $(IMG) .

rss-bridge/Dockerfile

@@ -1,4 +1,4 @@
-FROM alpine:3.13
+FROM alpine:3.14
 
 RUN apk add --no-cache \
         git su-exec nginx php7 php7-fpm \

rss-bridge/Makefile

@@ -1,10 +1,15 @@
-USERNAME = rilla
 IMG_NAME = rss-bridge
+REGISTRY=registry.monotremata.xyz:443
 
-.PHONY: build build-nc
+IMG=$(REGISTRY)/$(IMG_NAME)
+
+.PHONY: build build-nc push
 
 build: Dockerfile
-	docker build -t $(USERNAME)/$(IMG_NAME) .
+	docker build -t $(IMG) .
+
+push: build
+	docker image push $(IMG)
 
 build-nc: Dockerfile
-	docker build --no-cache -t $(USERNAME)/$(IMG_NAME) .
+	docker build --no-cache -t $(IMG) .

syncthing/Dockerfile

@@ -1,32 +1,29 @@
 # syncthing
 
-FROM alpine:3.13
+FROM alpine:3.15
 
-ARG ARCH
+ARG TARGETPLATFORM
-ENV VER v1.13.1
+ENV VERSION v1.20.1
-ENV REL syncthing-linux-${ARCH}-${VER}
-ENV URI https://github.com/syncthing/syncthing/releases/download/${VER}/${REL}.tar.gz
 
-RUN apk add --no-cache su-exec
+RUN addgroup --gid 10001 syncthing && \
+    adduser \
+        --uid 10000 \
+        --home /var/lib/syncthing \
+        --ingroup syncthing \
+        --disabled-password \
+        --shell /sbin/nologin \
+        syncthing && \
+    mkdir -p /data && chown -R syncthing:syncthing /data && \
+    cd /tmp && \
+    ARCH=$(echo "$TARGETPLATFORM" | sed 's/\//-/') && \
+    RELEASE="syncthing-${ARCH}-${VERSION}" && \
+    URI="https://github.com/syncthing/syncthing/releases/download/${VERSION}/${RELEASE}.tar.gz" && \
+    echo "$URI" && \
+    wget "${URI}" && \
+    tar -xzf "${RELEASE}.tar.gz" && \
+    cp "/tmp/${RELEASE}/syncthing" /usr/local/bin/syncthing && \
+    rm -r "/tmp/${RELEASE}" "/tmp/${RELEASE}.tar.gz"
 
-RUN adduser -u 1001 -h /var/lib/syncthing -D syncthing && \
+VOLUME /data /var/lib/syncthing
-    addgroup -S -g 1005 books && addgroup syncthing books && \
+USER syncthing
-    addgroup -S -g 1006 buku  && addgroup syncthing buku
-
-RUN mkdir -p /data       && chown -R syncthing:syncthing /data && \
-    mkdir -p /data/books && chown -R syncthing:books     /data/books && chmod '2775' /data/books && \
-    mkdir -p /data/buku  && chown -R syncthing:buku      /data/buku  && chmod '2775' /data/buku
-
-VOLUME /data /data/books /data/buku /var/lib/syncthing
-
-RUN cd /tmp && \
-    wget ${URI} && \
-    tar -xzf ${REL}.tar.gz && \
-    cp /tmp/${REL}/syncthing /usr/local/bin/syncthing && \
-    rm -r /tmp/${REL} /tmp/${REL}.tar.gz
-
-COPY docker-entrypoint.sh /entrypoint
-
-RUN chmod +x /entrypoint
-ENTRYPOINT ["/entrypoint"]
 CMD ["/usr/local/bin/syncthing", "-home=/var/lib/syncthing"]

syncthing/Makefile

@@ -1,19 +1,31 @@
-USERNAME = rilla
 IMG_NAME = syncthing
+REGISTRY=registry.monotremata.xyz
+IMG=$(REGISTRY)/$(IMG_NAME)
+PLATFORMS=linux/amd64,linux/arm64
 
-.PHONY: build build-nc
+.PHONY: build build-nc buildx push
 
 hw=$(shell uname -m)
 ifeq ($(hw), x86_64)
-	ARCH=amd64
+	TARGETPLATFORM=linux/amd64
 else ifeq ($(hw), aarch64)
-	ARCH=arm64
+	TARGETPLATFORM=linux/arm64
 else
-	ARCH=$(hw)
+	TARGETPLATFORM=linux/$(hw)
 endif
 
-build: Dockerfile docker-entrypoint.sh
+build: Dockerfile
-	docker build -t $(USERNAME)/$(IMG_NAME) --build-arg ARCH=$(ARCH) .
+	docker build -t $(IMG) --build-arg TARGETPLATFORM=$(TARGETPLATFORM) .
 
-build-nc: Dockerfile docker-entrypoint.sh
+buildx: Dockerfile
-	docker build --no-cache -t $(USERNAME)/$(IMG_NAME) --build-arg ARCH=$(ARCH) .
+	docker buildx build \
+		--platform $(PLATFORMS) \
+		--tag $(IMG) \
+		--push \
+		.
+
+push: build
+	docker image push $(IMG)
+
+build-nc: Dockerfile
+	docker build --no-cache -t $(IMG) --build-arg ARCH=$(ARCH) .

syncthing/docker-entrypoint.sh

@@ -1,9 +0,0 @@
-#!/bin/sh
-
-chown -R syncthing:syncthing /data
-chown -R syncthing:syncthing /var/lib/syncthing
-chown -R syncthing:books /data/books
-chown -R syncthing:buku /data/buku && touch /data/buku/bookmarks.db && chmod '664' /data/buku/bookmarks.db
-chmod '2775' /data/books
-
-exec su-exec syncthing "$@"

tasks/Dockerfile

@@ -1,4 +1,4 @@
-FROM alpine:3.12
+FROM alpine:3.14
 
 RUN apk add --update --no-cache \
         docker-compose \

tasks/Makefile

@@ -1,10 +1,15 @@
-USERNAME = rilla
 IMG_NAME = tasks
+REGISTRY=registry.monotremata.xyz:443
 
-.PHONY: build build-nc
+IMG=$(REGISTRY)/$(IMG_NAME)
+
+.PHONY: build build-nc push
 
 build: Dockerfile entrypoint.sh
-	docker build -t $(USERNAME)/$(IMG_NAME) .
+	docker build -t $(IMG) .
+
+push: build
+	docker image push $(IMG)
 
 build-nc: Dockerfile entrypoint.sh
-	docker build --no-cache -t $(USERNAME)/$(IMG_NAME) .
+	docker build --no-cache -t $(IMG)

tor/Dockerfile

@@ -1,4 +1,4 @@
-FROM alpine:3.13
+FROM alpine:3.16
 
 COPY entrypoint.sh /entrypoint
 

tor/Makefile

@@ -1,10 +1,19 @@
-USERNAME = rilla
+IMG_NAME=tor
-IMG_NAME = tor
+REGISTRY=registry.monotremata.xyz
+IMG=$(REGISTRY)/$(IMG_NAME)
+PLATFORMS=linux/amd64
 
-.PHONY: build build-nc
+.PHONY: build push buildx
 
 build: Dockerfile entrypoint.sh
-	docker build -t $(USERNAME)/$(IMG_NAME) .
+	docker build -t $(IMG) .
 
-build-nc: Dockerfile entrypoint.sh
+push: build
-	docker build --no-cache -t $(USERNAME)/$(IMG_NAME) .
+	docker image push $(IMG)
+
+buildx: Dockerfile entrypoint.sh
+	docker buildx build \
+		--platform $(PLATFORMS) \
+		--tag $(IMG) \
+		--push \
+		.

transmission/Dockerfile

@@ -1,7 +1,9 @@
-FROM alpine:3.13
+FROM alpine:3.14
+
+ENV VER 3.00
 
 RUN apk add --no-cache --virtual .build-deps \
-        git \
+        curl \
         cmake \
         make \
         gcc \
@@ -12,8 +14,10 @@ RUN apk add --no-cache --virtual .build-deps \
         autoconf \
         libtool && \
     mkdir -p /usr/local/src && \
-    git clone https://github.com/transmission/transmission /usr/local/src/transmission && \
+    curl -L \
-    git -C /usr/local/src/transmission submodule update --init && \
+        --output "/usr/local/src/transmission-${VER}.tar.xz" \
+        "https://github.com/transmission/transmission-releases/raw/master/transmission-${VER}.tar.xz" && \
+    tar -xf "/usr/local/src/tranmission-${VER}.tar.xz" -C /usr/local/src && \
     mkdir -p /usr/local/src/transmission/build && \
     cd /usr/local/src/transmission/build && \
     cmake .. && \

transmission/Makefile

@@ -1,10 +1,14 @@
-USERNAME = rilla
 IMG_NAME = transmission
+REGISTRY=registry.monotremata.xyz:443
+IMG=$(REGISTRY)/$(IMG_NAME)
 
-.PHONY: build build-nc
+.PHONY: build build-nc push
 
 build: Dockerfile
-	docker build -t $(USERNAME)/$(IMG_NAME) .
+	docker build -t $(IMG) .
+
+push: build
+	docker image push $(IMG)
 
 build-nc: Dockerfile
-	docker build --no-cache -t $(USERNAME)/$(IMG_NAME) .
+	docker build --no-cache -t $(IMG) .

vdirsyncer/Dockerfile

@@ -1,4 +1,4 @@
-FROM alpine:3.13
+FROM alpine:3.14
 
 RUN apk add --no-cache python3 py3-pip su-exec && \
     pip3 install --upgrade pip && \

vdirsyncer/Makefile

@@ -1,10 +1,20 @@
-USERNAME = rilla
 IMG_NAME = vdirsyncer
+USERNAME = rilla
+REGISTRY=registry.monotremata.xyz:443
 
-.PHONY: build build-nc
+LOCAL_IMG=$(USERNAME)/$(IMG_NAME)
+REGISTRY_IMG=$(REGISTRY)/$(IMG_NAME)
+
+.PHONY: build build-nc tag push
 
 build: Dockerfile entrypoint.sh crontab do_sync.sh
 	docker build -t $(USERNAME)/$(IMG_NAME) .
 
+tag: build
+	docker image tag $(LOCAL_IMG) $(REGISTRY_IMG)
+
+push: tag
+	docker image push $(REGISTRY_IMG)
+
 build-nc: Dockerfile entrypoint.sh crontab do_sync.sh
 	docker build --no-cache -t $(USERNAME)/$(IMG_NAME) .

webdav/Dockerfile

@@ -0,0 +1,6 @@
+FROM alpine:3.15
+
+RUN apk add --no-cache nginx nginx-mod-http-dav-ext
+COPY nginx.conf /etc/nginx/nginx.conf
+
+CMD ["nginx", "-g", "daemon off;"]

webdav/Makefile

@@ -0,0 +1,22 @@
+IMG_NAME = webdav
+REGISTRY=registry.monotremata.xyz
+IMG=$(REGISTRY)/$(IMG_NAME)
+PLATFORMS=linux/amd64,linux/arm64
+
+.PHONY: build build-nc push
+
+build: Dockerfile
+	docker build -t $(IMG) .
+
+buildx: Dockerfile
+	docker buildx build \
+	    --platform $(PLATFORMS) \
+	    --tag $(IMG) \
+	    --push \
+	    .
+
+push: build
+	docker image push $(IMG)
+
+build-nc: Dockerfile
+	docker build --no-cache -t $(IMG) .

webdav/nginx.conf

@@ -0,0 +1,32 @@
+user  nginx;
+worker_processes  auto;
+
+error_log  /var/log/nginx/error.log notice;
+pid        /var/run/nginx.pid;
+
+include /etc/nginx/modules/*.conf;
+
+events {
+    worker_connections  1024;
+}
+
+
+http {
+    include       /etc/nginx/mime.types;
+    default_type  application/octet-stream;
+
+    log_format  main  '$remote_addr - $remote_user [$time_local] "$request" '
+                      '$status $body_bytes_sent "$http_referer" '
+                      '"$http_user_agent" "$http_x_forwarded_for"';
+
+    access_log  /var/log/nginx/access.log  main;
+
+    sendfile        on;
+    #tcp_nopush     on;
+
+    keepalive_timeout  65;
+
+    #gzip  on;
+
+    include /etc/nginx/conf.d/*.conf;
+}

xandikos/Dockerfile

@@ -1,4 +1,4 @@
-FROM alpine:3.11
+FROM alpine:3.14
 
 RUN apk add --no-cache \
         git \
@@ -12,12 +12,13 @@ RUN apk add --no-cache \
     pip3 install --upgrade pip && \
     pip3 install \
         aiohttp \
-        defusedxml \
-        dulwich \
         icalendar \
+        dulwich>=0.19.1 \
+        defusedxml \
         jinja2 \
+        multidict \
         prometheus-client && \
-    apk del .build-deps && \
+    # apk del .build-deps && \
     mkdir -p /opt && \
     git clone https://github.com/jelmer/xandikos /opt/xandikos && \
     adduser -D -h /var/lib/xandikos xandikos && \

xandikos/Makefile

@@ -1,10 +1,15 @@
-USERNAME = rilla
 IMG_NAME = xandikos
+REGISTRY=registry.monotremata.xyz:443
 
-.PHONY: build build-nc
+IMG=$(REGISTRY)/$(IMG_NAME)
+
+.PHONY: build build-nc push
 
 build: Dockerfile entrypoint.sh
-	docker build -t $(USERNAME)/$(IMG_NAME) .
+	docker build -t $(IMG) .
+
+push: build
+	docker image push $(IMG)
 
 build-nc: Dockerfile entrypoint.sh
-	docker build --no-cache -t $(USERNAME)/$(IMG_NAME) .
+	docker build --no-cache -t $(IMG) .