docker-compose.yml

@@ -10,8 +10,6 @@ include:
   - services/miniflux.yml
   - services/jelu.yml
   - services/sonarr.yml
-  - services/postgres.yml
-  - services/nextcloud.yml
 
 
 services:
@@ -499,6 +497,19 @@ services:
     profiles:
       - base
 
+  postgres:
+    container_name: postgres
+    image: postgres:latest
+    networks:
+      public:
+        ipv4_address: 192.168.240.25
+    volumes:
+      - "${DOCKER_STORAGE_PATH}/postgres:/var/lib/postgresql/data"
+    restart: unless-stopped
+    profiles:
+      - base
+      - infra
+
   gitea:
     container_name: gitea
     image: ${REGISTRY_URL}/gitea:latest

services/nextcloud.yml

@@ -1,20 +0,0 @@
----
-services:
-  nextcloud:
-    image: registry.kucharczyk.xyz/nextcloud:latest
-    container_name: nextcloud
-    networks:
-      public:
-        ipv4_address: 192.168.240.32
-    depends_on:
-      - postgres
-    volumes:
-      - "${DOCKER_STORAGE_PATH}/nextcloud/config:/var/www/html/config"
-      - "${DOCKER_STORAGE_PATH}/nextcloud/data:/var/www/html/data"
-      - "${DOCKER_STORAGE_PATH}/nextcloud/html:/var/www/html"
-    environment:
-      # caddy
-      - TRUSTED_PROXIES=192.168.240.2
-    profiles:
-      - base
-    restart: unless-stopped

services/postgres.yml

@@ -1,13 +0,0 @@
----
-  postgres:
-    container_name: postgres
-    image: postgres:latest
-    networks:
-      public:
-        ipv4_address: 192.168.240.25
-    volumes:
-      - "${DOCKER_STORAGE_PATH}/postgres:/var/lib/postgresql/data"
-    restart: unless-stopped
-    profiles:
-      - base
-      - infra