From 8fc3e5501baf78b2731b6f57f3fbfcce05c8e565 Mon Sep 17 00:00:00 2001
From: Andrew Hurley <andrew@cherished.me>
Date: Sat, 19 Nov 2022 01:06:14 +0800
Subject: [PATCH] latest

---
 docker-compose.yml | 87 +++++++++++++++++++++-------------------------
 1 file changed, 39 insertions(+), 48 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index eb1b85b..7bcd687 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -8,58 +8,20 @@ networks:
 
 volumes:
   
-  webtop-config:
-  plexs-config:
   embys-config:
   fsync-config:
   nextc-config:
   nextc-db-config:
+  onlyo-ds-log:
+  onlyo-ds-lib:
+  onlyo-ds-www:
+  onlyo-ds-pg:
+  onlyo-ds-rb:
+  onlyo-ds-rd:
+  onlyo-ds-font:
 
 services:
 
-  webtop:
-    image: lscr.io/linuxserver/webtop:alpine-mate
-    restart: unless-stopped
-    environment:
-      - PUID=1000
-      - PGID=1000
-      - TZ=Australia/Perth
-      - SUBFOLDER=/ #optional
-      - KEYBOARD=en-us-qwerty #optional
-      - TITLE=Webtop #optional
-    volumes:
-      - ${BIND?Err}webtop-config:/config
-    ports:
-      - "3000:3000"
-    devices:
-      - /dev/dri:/dev/dri #optional
-    shm_size: "1gb" #optional
-
-  plexs:
-    image: lscr.io/linuxserver/plex:1.29.1
-    restart: always
-    environment:
-      - PUID=1000
-      - PGID=2000
-      - VERSION=docker
-      - PLEX_CLAIM=
-      - TZ=Australia/Perth
-    volumes:
-      - ${BIND?err}plexs-config:/config
-      - ${DATA?err}media:/media
-    ports:
-      - "32400:32400"
-      - "1900:1900"
-      - "5353:5353/udp"
-      - "8324:8324"
-      - "32410/udp"
-      - "32412/udp"
-      - "32413/udp"
-      - "32414/udp"
-      - "32469"
-    devices:
-      - /dev/dri:/dev/dri
-
   embys:
     image: lscr.io/linuxserver/emby:amd64-4.7.8
     restart: always
@@ -122,7 +84,7 @@ services:
       - ${BIND?err}nextc-db-config:/config
     environment:
       - PUID=1000
-      - PGID=1000
+      - PGID=2000
       - TZ=Australia/Perth
       - REMOTE_SQL=
     networks:
@@ -141,7 +103,36 @@ services:
       - ${BIND?err}onlyo-ds-rb:/var/lib/rabbitmq
       - ${BIND?err}onlyo-ds-rd:/var/lib/redis
       - ${BIND?err}onlyo-ds-font:/usr/share/fonts/truetype/custom
-    env_file:
-      - ${CONF?err}onlyo-ds.env
+    environment:
+      - ONLYOFFICE_HTTPS_HSTS_ENABLED=true
+      - ONLYOFFICE_HTTPS_HSTS_MAXAGE=
+      - SSL_CERTIFICATE_PATH=/onlyo-ds.crt
+      - SSL_KEY_PATH=/onlyo-ds.key
+      - SSL_DHPARAM_PATH=
+      - SSL_VERIFY_CLIENT=
+      - DB_TYPE=
+      - DB_HOST=
+      - DB_PORT=
+      - DB_NAME=
+      - DB_USER=
+      - DB_PWD=
+      - AMQP_URI=
+      - AMQP_TYPE=
+      - REDIS_SERVER_HOST=
+      - REDIS_SERVER_PORT=
+      - NGINX_WORKER_PROCESSES=
+      - NGINX_WORKER_CONNECTIONS=
+      - JWT_ENABLED=
+      - JWT_SECRET=
+      - JWT_HEADER=
+      - JWT_IN_BODY=
+      - USE_UNAUTHORIZED_STORAGE=
+      - GENERATE_FONTS=
+      - METRICS_ENABLED=
+      - METRICS_HOST=
+      - METRICS_PORT=
+      - METRICS_PREFIX=
+      - LETS_ENCRYPT_DOMAIN=
+      - LETS_ENCRYPT_MAIL=
     networks:
       - local