Using strict image versions in docker-compose.

Makefile

@@ -1,7 +1,5 @@
 TERRAFORM_ENV=production
 
-include apps.config
-
 # .dirstamp plus && $@ is like make magic to get this rule
 # to only run if the contents of all-apps changes
 app/.dirstamp: all-apps/app.service all-apps/docker-compose.yaml $(wildcard all-apps/lb/*) $(wildcard all-apps/nextcloud/*) $(wildcard all-apps/wg-easy/*)
@@ -14,17 +12,17 @@ all-apps/lb/Caddyfile: apps.config make-caddyfile.sh
 
 # Nextcloud
 all-apps/nextcloud/nextcloud_admin_user: apps.config
-	echo "$(NEXTCLOUD_ADMIN_USER)" > $@
+	bash -c 'source ./apps.config; printf "%s\n" "$$NEXTCLOUD_ADMIN_USER" > $@'
 all-apps/nextcloud/nextcloud_admin_password: apps.config
-	echo "$(NEXTCLOUD_ADMIN_PASSWORD)" > $@
+	bash -c 'source ./apps.config; printf "%s\n" "$$NEXTCLOUD_ADMIN_PASSWORD" > $@'
 all-apps/nextcloud/postgres_db: apps.config
-	echo "$(NEXTCLOUD_POSTGRES_DB)" > $@
+	bash -c 'source ./apps.config; printf "%s\n" "$$NEXTCLOUD_POSTGRES_DB" > $@'
 all-apps/nextcloud/postgres_user: apps.config
-	echo "$(NEXTCLOUD_POSTGRES_USER)" > $@
+	bash -c 'source ./apps.config; printf "%s\n" "$$NEXTCLOUD_POSTGRES_USER" > $@'
 all-apps/nextcloud/postgres_password: apps.config
-	echo "$(NEXTCLOUD_POSTGRES_PASSWORD)" > $@
+	bash -c 'source ./apps.config; printf "%s\n" "$$NEXTCLOUD_POSTGRES_PASSWORD" > $@'
 all-apps/nextcloud/redis_password: apps.config
-	echo "$(NEXTCLOUD_REDIS_PASSWORD)" > $@
+	bash -c 'source ./apps.config; printf "%s\n" "$$NEXTCLOUD_REDIS_PASSWORD" > $@'
 all-apps/nextcloud/nextcloud.env: apps.config make-nextcloud-env.sh
 	./make-nextcloud-env.sh
 

all-apps/docker-compose.yaml

@@ -1,7 +1,7 @@
 version: '3'
 services:
   lb:
-    image: docker.io/caddy:2
+    image: docker.io/caddy:2.10.2-alpine
     volumes:
 #      - /app/lb:/etc/caddy
       - ./lb/:/etc/caddy
@@ -20,6 +20,3 @@ services:
       - lb
 networks:
   lb:
-# volumes:
-#   config:
-#   data:

all-apps/nextcloud/docker-compose.yaml

@@ -16,7 +16,7 @@ secrets:
 
 services:
   db:
-    image: postgres
+    image: postgres:17.6-trixie
     env_file:
       - ./nextcloud/nextcloud.env
     shm_size: 128mb
@@ -40,7 +40,7 @@ services:
       - postgres_password
       - postgres_user
   redis:
-    image: redis
+    image: redis:8.2.1-bookworm
     env_file:
       - ./nextcloud/nextcloud.env
     command: bash -c 'redis-server --requirepass "$$(cat /run/secrets/redis_password)"'
@@ -56,7 +56,7 @@ services:
     networks:
       - internal
   nextcloud:
-    image: nextcloud
+    image: nextcloud:31.0.8-apache
     environment:
       - POSTGRES_HOST=db
       - POSTGRES_DB=nextcloud

all-apps/wg-easy/docker-compose.yaml

@@ -33,5 +33,3 @@ networks:
       config:
         - subnet: 10.42.42.0/24
         - subnet: fdcc:ad94:bacf:61a3::/64
-# volumes:
-#   etc_wireguard: