Improve building special images

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 \

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}}"

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:

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}}"

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

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