From 975d6bfb6753c686bca132bec4b15bc064c910d9 Mon Sep 17 00:00:00 2001 From: Matthias Date: Mon, 5 Jan 2026 19:10:21 +0100 Subject: [PATCH] Updated storage for nextcloud containers, removed the bindmounts and replaced nextcloud/storage with nextcloud_storage Also, added a new video library to nextcloud building script --- homenetwork/nas/nextcloud/docker-compose.yml | 64 ++++++++------------ homenetwork/nas/nextcloud/nc/Dockerfile | 1 + 2 files changed, 27 insertions(+), 38 deletions(-) diff --git a/homenetwork/nas/nextcloud/docker-compose.yml b/homenetwork/nas/nextcloud/docker-compose.yml index 64ea1f2..97352e1 100644 --- a/homenetwork/nas/nextcloud/docker-compose.yml +++ b/homenetwork/nas/nextcloud/docker-compose.yml @@ -1,32 +1,11 @@ - -volumes: - nchome: - driver: local - driver_opts: - type: none - o: bind - device: /srv/dev-disk-by-uuid-9033ccb2-df6d-46a3-9996-99a0d4d34688/nextcloud/home - ncdb: - driver: local - driver_opts: - type: none - o: bind - device: /srv/dev-disk-by-uuid-9033ccb2-df6d-46a3-9996-99a0d4d34688/nextcloud/database - ncdata: - driver: local - driver_opts: - type: none - o: bind - device: /srv/dev-disk-by-uuid-17e88007-4d0c-45e0-8757-cacfcc458630/nextcloud/storage - - services: db: - image: mariadb:10.6 + image: mariadb:latest restart: always - command: --transaction-isolation=READ-COMMITTED --log-bin=binlog --binlog-format=ROW + command: --transaction-isolation=READ-COMMITTED --log-bin=binlog --binlog-format=ROW --log_bin_trust_function_creators=true volumes: - - ncdb:/var/lib/mysql:Z + - /srv/dev-disk-by-uuid-9033ccb2-df6d-46a3-9996-99a0d4d34688/nextcloud/database:/var/lib/mysql:Z +# - ./database:/var/lib/mysql environment: - MYSQL_ROOT_PASSWORD=rootpw - MYSQL_PASSWORD=password @@ -34,28 +13,32 @@ services: - MYSQL_USER=nextcloud aio-imaginary: - image: nextcloud/aio-imaginary:latest + image: ghcr.io/nextcloud-releases/aio-imaginary:latest restart: always environment: - PORT=9000 ports: - 9999:9000 - command: -concurrency 50 -enable-url-source + command: -enable-url-source -enable-placeholder + cap_add: + - SYS_NICE nextcloud: - build: + build: context: ./nc - args: - UID: ${MUID} - GID: ${MGID} + args: + UID: ${MUID} + GID: ${MGID} restart: always ports: - 8888:80 links: - db volumes: - - nchome:/var/www/html:z - - ncdata:/var/www/html/data + - /srv/dev-disk-by-uuid-9033ccb2-df6d-46a3-9996-99a0d4d34688/nextcloud/home:/var/www/html:z +# - ./nchome:/var/www/html + - /srv/dev-disk-by-uuid-17e88007-4d0c-45e0-8757-cacfcc458630/nextcloud_storage:/var/www/html/data +# - ./ncdata:/var/www/html/data - /srv/dev-disk-by-uuid-17e88007-4d0c-45e0-8757-cacfcc458630/:/ex_storage/ - /srv/dev-disk-by-uuid-17e88007-4d0c-45e0-8757-cacfcc458630/bands/fearium:/ex_storage/bands/fearium - /srv/dev-disk-by-uuid-17e88007-4d0c-45e0-8757-cacfcc458630/bands/breakpointnine:/ex_storage/bands/breakpointnine @@ -66,7 +49,8 @@ services: - /srv/dev-disk-by-uuid-17e88007-4d0c-45e0-8757-cacfcc458630/repositories:/ex_storage/repositories - /srv/dev-disk-by-uuid-17e88007-4d0c-45e0-8757-cacfcc458630/hwsw:/ex_storage/hwsw - /srv/dev-disk-by-uuid-17e88007-4d0c-45e0-8757-cacfcc458630/timelapse:/ex_storage/timelapse - - /srv/dev-disk-by-uuid-17e88007-4d0c-45e0-8757-cacfcc458630/pictures:/ex_storage/pictures + - /srv/dev-disk-by-uuid-17e88007-4d0c-45e0-8757-cacfcc458630/daf2000:/ex_storage/daf2000 + environment: - MYSQL_PASSWORD=password @@ -81,7 +65,7 @@ services: environment: - password=password - username=nextcloud - - domain=vbchaos.nl + - domain=mitscherlich.nl - extra_params=--o:ssl.enable=true ports: - 9980:9980 @@ -102,9 +86,13 @@ services: UID: ${MUID} GID: ${MGID} restart: always + links: + - db volumes: - - nchome:/var/www/html:z - - ncdata:/var/www/html/data + - /srv/dev-disk-by-uuid-9033ccb2-df6d-46a3-9996-99a0d4d34688/nextcloud/home:/var/www/html:z +# - ./nchome:/var/www/html + - /srv/dev-disk-by-uuid-17e88007-4d0c-45e0-8757-cacfcc458630/nextcloud_storage:/var/www/html/data +# - ./ncdata:/var/www/html/data - /srv/dev-disk-by-uuid-17e88007-4d0c-45e0-8757-cacfcc458630/:/ex_storage/ - /srv/dev-disk-by-uuid-17e88007-4d0c-45e0-8757-cacfcc458630/bands/fearium:/ex_storage/bands/fearium - /srv/dev-disk-by-uuid-17e88007-4d0c-45e0-8757-cacfcc458630/bands/breakpointnine:/ex_storage/bands/breakpointnine @@ -115,7 +103,7 @@ services: - /srv/dev-disk-by-uuid-17e88007-4d0c-45e0-8757-cacfcc458630/repositories:/ex_storage/repositories - /srv/dev-disk-by-uuid-17e88007-4d0c-45e0-8757-cacfcc458630/hwsw:/ex_storage/hwsw - /srv/dev-disk-by-uuid-17e88007-4d0c-45e0-8757-cacfcc458630/timelapse:/ex_storage/timelapse - - /srv/dev-disk-by-uuid-17e88007-4d0c-45e0-8757-cacfcc458630/pictures:/ex_storage/pictures + - /srv/dev-disk-by-uuid-17e88007-4d0c-45e0-8757-cacfcc458630/daf2000:/ex_storage/daf2000 environment: - MYSQL_PASSWORD=password diff --git a/homenetwork/nas/nextcloud/nc/Dockerfile b/homenetwork/nas/nextcloud/nc/Dockerfile index 0e7d78a..cd1ef84 100644 --- a/homenetwork/nas/nextcloud/nc/Dockerfile +++ b/homenetwork/nas/nextcloud/nc/Dockerfile @@ -9,6 +9,7 @@ RUN apt update \ && apt -y install \ # libmagickcore-6.q16-6-extra \ ffmpeg \ + libavcodec-extra \ imagemagick \ ghostscript \ && apt clean