From 308593a6bfdccf9e9ce227e1236bc38d8b61e4be Mon Sep 17 00:00:00 2001
From: Andrew Hurley <andrew@cherished.me>
Date: Sat, 29 Oct 2022 04:08:45 +0000
Subject: [PATCH] Update

---
 .env               |  3 +-
 docker-compose.yml | 92 +++++++++++++++++++++++++++++++++++++++++-----
 2 files changed, 85 insertions(+), 10 deletions(-)

diff --git a/.env b/.env
index a074282..c685bc9 100644
--- a/.env
+++ b/.env
@@ -1,4 +1,5 @@
 CONF=../config/
 BIND=
 CERT=../srvtls/
-DATA=../ncdata/
+DATA=../cndata/
+DORG=docker.io
diff --git a/docker-compose.yml b/docker-compose.yml
index 49cc6b8..3372122 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -8,8 +8,11 @@ networks:
       driver: default
       config:
         - subnet: 192.168.2.0/24
+
   local:
-    external: true
+    internal: true
+  nextc:
+    internal: true
 
 volumes:
 
@@ -23,10 +26,15 @@ volumes:
   webmail-data:
   webmail-overrides:
 
+  embys-config:
+  fsync-var:
+  nextc-html:
+  nextc-db:
+
 services:
 
   resolver:
-    image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX:-}unbound:${MAILU_VERSION:-1.9}
+    image: ${DORG?err}/mailu/unbound:${MAILU_VERSION:-1.9}
     env_file: ${CONF?err}mailu.env
     restart: always
     networks:
@@ -46,13 +54,13 @@ services:
       - 192.168.2.254
 
   front:
-    image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX:-}nginx:${MAILU_VERSION:-1.9}
+    image: ${DORG?err}/mailu/nginx:${MAILU_VERSION:-1.9}
     restart: on-failure:5
     env_file: ${CONF?err}mailu.env
     logging:
       driver: journald
       options:
-        tag: mailu-front
+        tag: docker-front
     ports:
       - "80:80"
       - "443:443"
@@ -76,7 +84,7 @@ services:
       - 192.168.2.254
 
   admin:
-    image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX:-}admin:${MAILU_VERSION:-1.9}
+    image: ${DORG?err}/mailu/admin:${MAILU_VERSION:-1.9}
     restart: always
     env_file:
       - ${CONF?err}mailu.env
@@ -92,7 +100,7 @@ services:
       - 192.168.2.254
 
   imap:
-    image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX:-}dovecot:${MAILU_VERSION:-1.9}
+    image: ${DORG?err}/mailu/dovecot:${MAILU_VERSION:-1.9}
     restart: always
     env_file:
       - ${CONF?err}mailu.env
@@ -107,7 +115,7 @@ services:
       - 192.168.2.254
 
   smtp:
-    image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX:-}postfix:${MAILU_VERSION:-1.9}
+    image: ${DORG?err}/mailu/postfix:${MAILU_VERSION:-1.9}
     restart: always
     env_file: ${CONF?err}mailu.env
     volumes:
@@ -121,7 +129,7 @@ services:
       - 192.168.2.254
 
   antispam:
-    image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX:-}rspamd:${MAILU_VERSION:-1.9}
+    image: ${DORG?err}/mailu/rspamd:${MAILU_VERSION:-1.9}
     hostname: antispam
     restart: always
     env_file:
@@ -137,7 +145,7 @@ services:
       - 192.168.2.254
 
   webmail:
-    image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX:-}roundcube:${MAILU_VERSION:-1.9}
+    image: ${DORG?err}/mailu/roundcube:${MAILU_VERSION:-1.9}
     restart: always
     env_file:
       - ${CONF?err}mailu.env
@@ -153,3 +161,69 @@ services:
     dns:
       - 192.168.2.254
 
+  embys:
+    image: ${DORG?err}/emby/embyserver
+    restart: on-failure:5
+    env_file:
+      - ${CONF?err}embys.env
+    volumes:
+      - ${BIND?err}embys-config:/config
+      - ${DATA?err}fmedia:/fmedia
+    ports:
+      - "8097:8096"
+    networks:
+      - local
+    devices:
+      - /dev/dri:/dev/dri
+
+  fsync:
+    image: ${DORG?err}/syncthing/syncthing
+    restart: on-failure:5
+    volumes:
+      - ${BIND}fsync-var:/var/syncthing
+      - /srv/fmedia/Mobile/Andrew:/var/syncthing/Andrew
+      - /srv/fmedia/Mobile/Susan:/var/syncthing/Susan
+    ports:
+      - "8384:8384"
+    env_file:
+      - ${CONF?err}fsync.env
+    networks:
+      - local
+
+  nextc:
+    image: ${DORG?err}/nextcloud:24.0
+    build:
+      context: https://cor.cherished.me/gt/andrew/docker-nextcloud.git
+      args:
+        - "VERSION=24.0"
+        - "PUID=1000"
+    restart: on-failure:5
+    volumes:
+      - ${BIND?err}nextc-html:/var/www/html
+      - ${DATA?err}:/ncdata
+      - /srv/fmedia:/fmedia
+    ports:
+      - "8080:80"
+    env_file:
+      - ${CONF?err}nextc.env
+    depends_on:
+      - nextc-db
+    networks:
+      - local
+      - nextc
+
+  nextc-db:
+    image: ${DORG?err}/mariadb:10.8
+    restart: on-failure:5
+    volumes:
+      - ${BIND?err}nextc-db:/var/lib/mysql
+    env_file:
+      - ${CONF?err}nextc-db.env
+    healthcheck:
+      test: ["CMD-SHELL","/usr/bin/mysql -hlocalhost -p$$MARIADB_ROOT_PASSWORD --execute=\"use ncdb;\""]
+      interval: 20s
+      timeout: 5s
+      retries: 5
+    networks:
+      - nextc
+