From 4fe31b51359b0d230d6af68e0050e3340b95d777 Mon Sep 17 00:00:00 2001
From: Florian Zirker <florian.zirker@kapsweyer.de>
Date: Wed, 23 Jul 2025 09:34:25 +0200
Subject: [PATCH] Improve building special images

---
 nextcloud/Dockerfile          | 2 +-
 nextcloud/Tasks.yaml          | 9 ++++++++-
 nextcloud/docker-compose.yaml | 2 +-
 proxy/Tasks.yaml              | 8 ++++++++
 proxy/caddy/Dockerfile        | 6 ++++--
 proxy/docker-compose.yaml     | 2 +-
 6 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/nextcloud/Dockerfile b/nextcloud/Dockerfile
index 7b9cb73..5ff5e7d 100644
--- a/nextcloud/Dockerfile
+++ b/nextcloud/Dockerfile
@@ -1,4 +1,4 @@
-ARG NC_MAIN_VERSION
+ARG NC_MAIN_VERSION=stable
 FROM nextcloud:$NC_MAIN_VERSION-fpm
 
 RUN apt-get update && apt-get install -y --no-install-recommends \
diff --git a/nextcloud/Tasks.yaml b/nextcloud/Tasks.yaml
index f099fbb..9e589fb 100644
--- a/nextcloud/Tasks.yaml
+++ b/nextcloud/Tasks.yaml
@@ -8,8 +8,8 @@ tasks:
   pull:
     desc: Pull all images for {{.NAME}} and build images
     dir: "{{.TASKFILE_DIR}}"
+    deps: [build]
     cmds:
-      - docker compose build --pull
       - docker compose pull --ignore-buildable
 
   up:
@@ -18,6 +18,13 @@ tasks:
     cmds:
       - docker compose up -d
 
+  build:
+    desc: "Building special Nextcloud image (Mainly install software)"
+    dir: "{{.TASKFILE_DIR}}"
+    dotenv: [.env]
+    cmds:
+      -  docker build --pull --build-arg NC_MAIN_VERSION=$NC_MAIN_VERSION --tag $DOCKER_REGISTRY/nextcloud:${NC_MAIN_VERSION}-fpm .
+
   down:
     desc: Stop {{.NAME}} docker compose
     dir: "{{.TASKFILE_DIR}}"
diff --git a/nextcloud/docker-compose.yaml b/nextcloud/docker-compose.yaml
index 644f0fd..f96d77b 100644
--- a/nextcloud/docker-compose.yaml
+++ b/nextcloud/docker-compose.yaml
@@ -49,7 +49,7 @@ services:
 
 
   cron:
-    image: nextcloud:${NC_MAIN_VERSION}-fpm-own
+    image: ${DOCKER_REGISTRY}/nextcloud:${NC_MAIN_VERSION}-fpm
     build:
       context: ./
       args:
diff --git a/proxy/Tasks.yaml b/proxy/Tasks.yaml
index 9302e82..ad9002d 100644
--- a/proxy/Tasks.yaml
+++ b/proxy/Tasks.yaml
@@ -8,9 +8,17 @@ tasks:
   pull:
     desc: Pull all images for {{.NAME}}
     dir: "{{.TASKFILE_DIR}}"
+    deps: [build]
     cmds:
       - docker compose pull --ignore-buildable
 
+  build:
+    desc: "Building special Caddy image with netcup support"
+    dir: "{{.TASKFILE_DIR}}"
+    dotenv: [.env]
+    cmds:
+      -  docker build --pull --file caddy/Dockerfile --build-arg CADDY_VERSION=$CADDY_VERSION --tag $DOCKER_REGISTRY/caddy:${CADDY_VERSION} .
+
   up:
     desc: Starting {{.NAME}} docker compose as daemon
     dir: "{{.TASKFILE_DIR}}"
diff --git a/proxy/caddy/Dockerfile b/proxy/caddy/Dockerfile
index 7223e84..7c550b1 100644
--- a/proxy/caddy/Dockerfile
+++ b/proxy/caddy/Dockerfile
@@ -1,7 +1,9 @@
-FROM caddy:2-builder AS builder
+ARG CADDY_VERSION=2
+
+FROM caddy:${CADDY_VERSION}-builder AS builder
 
 RUN xcaddy build --with github.com/caddy-dns/netcup
 
-FROM caddy:2
+FROM caddy:${CADDY_VERSION}
 
 COPY --from=builder /usr/bin/caddy /usr/bin/caddy
diff --git a/proxy/docker-compose.yaml b/proxy/docker-compose.yaml
index 262e603..499851b 100755
--- a/proxy/docker-compose.yaml
+++ b/proxy/docker-compose.yaml
@@ -1,7 +1,7 @@
 services:
 
   caddy:
-    image: florianzirker.de/caddy-netcup
+    image: ${DOCKER_REGISTRY}/caddy:${CADDY_VERSION}
     build: ./caddy
     networks:
       - web