From baa0b7ac1159f49b2b9a56bc79789898ae862100 Mon Sep 17 00:00:00 2001
From: Ricard Illa <rilla@monotremata.xyz>
Date: Mon, 7 Mar 2022 13:55:05 +0100
Subject: [PATCH] many changes

---
 backup/Makefile         | 15 ++++++++++-----
 gitolite/Dockerfile     |  2 +-
 gitolite/Makefile       | 12 ++++++++----
 monero/Dockerfile       |  4 ++--
 monero/Makefile         | 12 ++++++++----
 rainloop/Dockerfile     |  2 +-
 rainloop/Makefile       | 13 +++++++++----
 rss-bridge/Dockerfile   |  2 +-
 rss-bridge/Makefile     | 13 +++++++++----
 syncthing/Dockerfile    |  4 ++--
 syncthing/Makefile      | 13 +++++++++----
 tasks/Dockerfile        |  2 +-
 tasks/Makefile          | 13 +++++++++----
 transmission/Dockerfile | 12 ++++++++----
 transmission/Makefile   | 12 ++++++++----
 vdirsyncer/Dockerfile   |  2 +-
 vdirsyncer/Makefile     | 14 ++++++++++++--
 xandikos/Dockerfile     |  9 +++++----
 xandikos/Makefile       | 13 +++++++++----
 19 files changed, 113 insertions(+), 56 deletions(-)

diff --git a/backup/Makefile b/backup/Makefile
index 1989811..874143f 100644
--- a/backup/Makefile
+++ b/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
-	docker build --no-cache -t $(USERNAME)/$(IMG_NAME) .
+push: build
+	docker image push $(IMG)
+
+build-nc: Dockerfile docker-entrypoint.sh sshd_config
+	docker build --no-cache -t $(IMG)
diff --git a/gitolite/Dockerfile b/gitolite/Dockerfile
index 143c866..57a43ed 100644
--- a/gitolite/Dockerfile
+++ b/gitolite/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.12
+FROM alpine:3.14
 
 RUN apk add --update --no-cache \
         docker-compose \
diff --git a/gitolite/Makefile b/gitolite/Makefile
index a298f9b..047daa3 100644
--- a/gitolite/Makefile
+++ b/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) .
diff --git a/monero/Dockerfile b/monero/Dockerfile
index c9b9cee..be2a361 100644
--- a/monero/Dockerfile
+++ b/monero/Dockerfile
@@ -1,7 +1,7 @@
-FROM debian:buster-slim
+FROM debian:bullseye-slim
 
 ARG ARCH
-ENV VER v0.17.2.0
+ENV VER v0.17.2.3
 ENV URL "https://downloads.getmonero.org/cli/monero-linux-${ARCH}-${VER}.tar.bz2"
 
 RUN apt-get update && \
diff --git a/monero/Makefile b/monero/Makefile
index 8e0411b..9d0890c 100644
--- a/monero/Makefile
+++ b/monero/Makefile
@@ -1,7 +1,8 @@
-USERNAME = rilla
 IMG_NAME = monero
+REGISTRY=registry.monotremata.xyz:443
+IMG=$(REGISTRY)/$(IMG_NAME)
 
-.PHONY: build build-nc
+.PHONY: build build-nc push
 
 hw=$(shell uname -m)
 ifeq ($(hw), x86_64)
@@ -13,7 +14,10 @@ else
 endif
 
 build: Dockerfile
-	docker build -t $(USERNAME)/$(IMG_NAME) --build-arg ARCH=$(ARCH) .
+	docker build -t $(IMG) --build-arg ARCH=$(ARCH) .
+
+push: build
+	docker image push $(IMG)
 
 build-nc: Dockerfile
-	docker build --no-cache -t $(USERNAME)/$(IMG_NAME) --build-arg ARCH=$(ARCH) .
+	docker build --no-cache -t $(IMG) --build-arg ARCH=$(ARCH) .
diff --git a/rainloop/Dockerfile b/rainloop/Dockerfile
index 989cbb4..6ec419f 100644
--- a/rainloop/Dockerfile
+++ b/rainloop/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.13
+FROM alpine:3.14
 
 RUN apk add --no-cache \
         nginx \
diff --git a/rainloop/Makefile b/rainloop/Makefile
index 49c0359..8b79978 100644
--- a/rainloop/Makefile
+++ b/rainloop/Makefile
@@ -1,10 +1,15 @@
-USERNAME = rilla
 IMG_NAME = rainloop
+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) .
diff --git a/rss-bridge/Dockerfile b/rss-bridge/Dockerfile
index 614beb3..419182a 100644
--- a/rss-bridge/Dockerfile
+++ b/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 \
diff --git a/rss-bridge/Makefile b/rss-bridge/Makefile
index c4689b0..35d6561 100644
--- a/rss-bridge/Makefile
+++ b/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) .
diff --git a/syncthing/Dockerfile b/syncthing/Dockerfile
index 0a715b2..0f8c645 100644
--- a/syncthing/Dockerfile
+++ b/syncthing/Dockerfile
@@ -1,9 +1,9 @@
 # syncthing
 
-FROM alpine:3.13
+FROM alpine:3.14
 
 ARG ARCH
-ENV VER v1.18.1
+ENV VER v1.18.3
 ENV REL syncthing-linux-${ARCH}-${VER}
 ENV URI https://github.com/syncthing/syncthing/releases/download/${VER}/${REL}.tar.gz
 
diff --git a/syncthing/Makefile b/syncthing/Makefile
index f012ceb..9db4404 100644
--- a/syncthing/Makefile
+++ b/syncthing/Makefile
@@ -1,7 +1,9 @@
-USERNAME = rilla
 IMG_NAME = syncthing
+REGISTRY=registry.monotremata.xyz:443
 
-.PHONY: build build-nc
+IMG=$(REGISTRY)/$(IMG_NAME)
+
+.PHONY: build build-nc push
 
 hw=$(shell uname -m)
 ifeq ($(hw), x86_64)
@@ -13,7 +15,10 @@ else
 endif
 
 build: Dockerfile docker-entrypoint.sh
-	docker build -t $(USERNAME)/$(IMG_NAME) --build-arg ARCH=$(ARCH) .
+	docker build -t $(IMG) --build-arg ARCH=$(ARCH) .
+
+push: build
+	docker image push $(IMG)
 
 build-nc: Dockerfile docker-entrypoint.sh
-	docker build --no-cache -t $(USERNAME)/$(IMG_NAME) --build-arg ARCH=$(ARCH) .
+	docker build --no-cache -t $(IMG) --build-arg ARCH=$(ARCH) .
diff --git a/tasks/Dockerfile b/tasks/Dockerfile
index be27830..e387a1a 100644
--- a/tasks/Dockerfile
+++ b/tasks/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.12
+FROM alpine:3.14
 
 RUN apk add --update --no-cache \
         docker-compose \
diff --git a/tasks/Makefile b/tasks/Makefile
index 018b436..ffc1b47 100644
--- a/tasks/Makefile
+++ b/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)
diff --git a/transmission/Dockerfile b/transmission/Dockerfile
index a4eee7f..4cfc6ba 100644
--- a/transmission/Dockerfile
+++ b/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 && \
-    git -C /usr/local/src/transmission submodule update --init && \
+    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 .. && \
diff --git a/transmission/Makefile b/transmission/Makefile
index 366e77c..08923aa 100644
--- a/transmission/Makefile
+++ b/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) .
diff --git a/vdirsyncer/Dockerfile b/vdirsyncer/Dockerfile
index 6477bd6..536f1db 100644
--- a/vdirsyncer/Dockerfile
+++ b/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 && \
diff --git a/vdirsyncer/Makefile b/vdirsyncer/Makefile
index bc147eb..ac5384e 100644
--- a/vdirsyncer/Makefile
+++ b/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) .
diff --git a/xandikos/Dockerfile b/xandikos/Dockerfile
index cac06c6..d98afbf 100644
--- a/xandikos/Dockerfile
+++ b/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 && \
diff --git a/xandikos/Makefile b/xandikos/Makefile
index 8b598db..c41eb58 100644
--- a/xandikos/Makefile
+++ b/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) .