Working Draft

docker-compose.yaml

@@ -12,24 +12,17 @@ x-mail: &defaults
     - internalnet
 
 services:
-  ddnsgd:
-    <<: *defaults
-    container_name: "ddnsgd"
-    image: "ghcr.io/dominickbrasileiro/ddnsgd"
-    restart: "always"
 
   pgsqlserver:
     <<: *defaults
     container_name: pgsqlserver
     image: postgres:15
     volumes:
-      - type: bind
-        source: ./pgsql
-        target: /var/lib/postgresql/data:z
-      - ./config/pg-init-scripts:/docker-entrypoint-initdb.d:z
+      - sql_data:/var/lib/postgresql/data/:z
+      - ./config/pg-init-scripts:/docker-entrypoint-initdb.d:ro
     restart: always
-    ports:
-      - "5432:5432"
+    expose:
+      - "5432"
 
   roundcubemail:
     <<: *defaults
@@ -37,17 +30,20 @@ services:
     container_name: roundcubemail
     environment:
       - ROUNDCUBEMAIL_DB_HOST=pgsqlserver
+      - VIRTUAL_HOST=zathura.leene.dev
+      - LETSENCRYPT_HOST=zathura.leene.dev
+      - LETSENCRYPT_EMAIL=admin@zathura.leene.dev
     depends_on:
       - pgsqlserver
     links:
       - pgsqlserver
-    ports:
-      - "9000:9000"
+    expose:
+      - "9000"
     volumes:
-      - ./nginx/html/:/var/www/html/:z
+      - nginx_html/roundcubemail:/var/www/html
 
   mailserver:
-    build: .
+    build: ./config/mail
     <<: *defaults
     image: mailserver/docker-mailserver:latest
     container_name: mailserver
@@ -59,40 +55,43 @@ services:
       - "587:587"
       - "993:993"
     volumes:
-      - ./nginx/certs/:/etc/letsencrypt/live/:z
-      - ./mail/mail-data/:/var/mail/:z
-      - ./mail/mail-state/:/var/mail-state/:z
-      - ./mail/mail-logs/:/var/log/mail/:z
-      - ./mail/config/:/tmp/docker-mailserver/:z
-      - ./nginx/certs/:/certs/:z
+      - nginx_certs:/etc/letsencrypt/live/
+      - mail_data:/var/mail/:z
+      - mail_state:/var/mail-state/:z
+      - mail_config:/tmp/docker-mailserver/:z
       - /etc/localtime:/etc/localtime:ro
-
     cap_add:
       - NET_ADMIN
     depends_on:
       - ddnsgd
     restart: always
 
+
   reverse-proxy:
     <<: *defaults
     image: nginxproxy/nginx-proxy
     container_name: nginx-proxy
-    environment:
-      - NGINX_PHP_CGI=roundcubemail:9000
     restart: always
     ports:
       - "80:80"
       - "443:443"
     volumes:
-      - ./nginx/conf/:/etc/nginx/conf.d:z
-      - ./nginx/html/:/usr/share/nginx/html/:z
-      - ./nginx/vhost/:/etc/nginx/vhost.d/:z
-      - ./nginx/certs/:/etc/nginx/certs/:z
-      - ./nginx/dhparam:/etc/nginx/dhparam:z
+      - nginx_dhparam:/etc/nginx/dhparam:z
+      - nginx_certs:/etc/nginx/certs/:z
+      - nginx_conf:/etc/nginx/conf.d/:z
+      - nginx_vhost:/etc/nginx/vhost.d/:z
+      - nginx_html:/usr/share/nginx/html/:z
+      - ./config/nginx/zathura.leene.dev_location:/etc/nginx/vhost.d/zathura.leene.dev_location:ro
       - /var/run/docker.sock:/tmp/docker.sock:z
     depends_on:
       - ddnsgd
 
+  ddnsgd:
+    <<: *defaults
+    container_name: "ddnsgd"
+    image: "ghcr.io/dominickbrasileiro/ddnsgd"
+    restart: "always"
+
   acme-companion:
     <<: *defaults
     image: nginxproxy/acme-companion
@@ -101,8 +100,20 @@ services:
     volumes_from:
       - reverse-proxy
     volumes:
-      - ./nginx/certs/:/etc/nginx/certs/:z
-      - ./nginx/acme-state/:/etc/acme.sh/:z
+      - acme-state:/etc/acme.sh
       - /var/run/docker.sock:/var/run/docker.sock:z
     depends_on:
       - ddnsgd
+    build: ./config/nginx
+
+volumes:
+  sql_data:
+  acme-state:
+  nginx_certs:
+  nginx_dhparam:
+  nginx_html:
+  nginx_conf:
+  nginx_vhost:
+  mail_data:
+  mail_config:
+  mail_state: