diff --git a/create/jenkins/Dockerfile b/create/jenkins/Dockerfile index 89f9d59..855b169 100644 --- a/create/jenkins/Dockerfile +++ b/create/jenkins/Dockerfile @@ -7,7 +7,8 @@ RUN apt-get update -qq \ ca-certificates \ curl \ gnupg2 \ - software-properties-common +# software-properties-common \ + && apt clean RUN install -m 0755 -d /etc/apt/keyrings diff --git a/homenetwork/nas/duplicati.yml b/homenetwork/nas/duplicati.yml new file mode 100644 index 0000000..774bd47 --- /dev/null +++ b/homenetwork/nas/duplicati.yml @@ -0,0 +1,18 @@ +services: + duplicati: + image: lscr.io/linuxserver/duplicati:latest + container_name: duplicati + environment: + - PUID=0 + - PGID=0 + - TZ=Etc/UTC + - SETTINGS_ENCRYPTION_KEY=12345678 + - CLI_ARGS= #optional + - DUPLICATI__WEBSERVICE_PASSWORD=password + volumes: +# - /path/to/duplicati/config:/config + - /srv/dev-disk-by-uuid-17e88007-4d0c-45e0-8757-cacfcc458630/duplicatitest:/backups + - /srv/dev-disk-by-uuid-17e88007-4d0c-45e0-8757-cacfcc458630/docker_config:/source + ports: + - 8200:8200 + restart: unless-stopped diff --git a/homenetwork/nas/nextcloud/db_test.yml b/homenetwork/nas/nextcloud/db_test.yml new file mode 100644 index 0000000..2adfca1 --- /dev/null +++ b/homenetwork/nas/nextcloud/db_test.yml @@ -0,0 +1,120 @@ +services: + db: + image: mariadb:latest + restart: always + command: --transaction-isolation=READ-COMMITTED --log-bin=binlog --binlog-format=ROW --log_bin_trust_function_creators=true + volumes: +# - /srv/dev-disk-by-uuid-9033ccb2-df6d-46a3-9996-99a0d4d34688/nextcloud/database:/var/lib/mysql:Z +# - /srv/dev-disk-by-uuid-9033ccb2-df6d-46a3-9996-99a0d4d34688/nextcloud/database.sock:/run/mysqld/mysqld.sock + - ./tmp_dir/database:/var/lib/mysql:Z + - ./tmp_dir/database.sock:/run/mysqld/mysqld.sock + environment: + - MYSQL_ROOT_PASSWORD=rootpw + - MYSQL_PASSWORD=password + - MYSQL_DATABASE=nextcloud + - MYSQL_USER=nextcloud + ports: + - 3306:3306 + + aio-imaginary: + image: ghcr.io/nextcloud-releases/aio-imaginary:latest + restart: always + environment: + - PORT=9000 + ports: + - 9999:9000 + command: -enable-url-source -enable-placeholder + cap_add: + - SYS_NICE + + nextcloud: + build: + context: ./nc + args: + UID: ${MUID} + GID: ${MGID} + restart: always + ports: + - 8888:80 + links: + - db + volumes: +# - /srv/dev-disk-by-uuid-9033ccb2-df6d-46a3-9996-99a0d4d34688/nextcloud/home:/var/www/html:z +# - /srv/dev-disk-by-uuid-17e88007-4d0c-45e0-8757-cacfcc458630/nextcloud_storage:/var/www/html/data + - ./tmp_dir/home:/var/www/html:z + - ./tmp_dir/nextcloud_storage:/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 + - /srv/dev-disk-by-uuid-17e88007-4d0c-45e0-8757-cacfcc458630/bands/lastfloorright:/ex_storage/bands/lastfloorright + - /srv/dev-disk-by-uuid-17e88007-4d0c-45e0-8757-cacfcc458630/bands/nofunkallowed:/ex_storage/bands/nofunkallowed + - /srv/dev-disk-by-uuid-17e88007-4d0c-45e0-8757-cacfcc458630/music:/ex_storage/music + - /srv/dev-disk-by-uuid-17e88007-4d0c-45e0-8757-cacfcc458630/video:/ex_storage/video + - /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/daf2000:/ex_storage/daf2000 + + environment: + - MYSQL_PASSWORD=password + - MYSQL_DATABASE=nextcloud + - MYSQL_USER=nextcloud + - MYSQL_HOST=db + - REDIS_HOST=redis + + collabora: + image: collabora/code:latest + restart: unless-stopped + environment: + - password=password + - username=nextcloud + - domain=mitscherlich.nl + - extra_params=--o:ssl.enable=true + ports: + - 9980:9980 + + + redis: + build: + context: ./redis + args: + UID: ${MUID} + GID: ${MGID} + restart: always + + cron: + build: + context: ./nc + args: + UID: ${MUID} + GID: ${MGID} + restart: always + links: + - db + volumes: +# - /srv/dev-disk-by-uuid-9033ccb2-df6d-46a3-9996-99a0d4d34688/nextcloud/home:/var/www/html:z +# - /srv/dev-disk-by-uuid-17e88007-4d0c-45e0-8757-cacfcc458630/nextcloud_storage:/var/www/html/data + - ./tmp_dir/home:/var/www/html:z + - ./tmp_dir/nextcloud_storage:/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 + - /srv/dev-disk-by-uuid-17e88007-4d0c-45e0-8757-cacfcc458630/bands/lastfloorright:/ex_storage/bands/lastfloorright + - /srv/dev-disk-by-uuid-17e88007-4d0c-45e0-8757-cacfcc458630/bands/nofunkallowed:/ex_storage/bands/nofunkallowed + - /srv/dev-disk-by-uuid-17e88007-4d0c-45e0-8757-cacfcc458630/music:/ex_storage/music + - /srv/dev-disk-by-uuid-17e88007-4d0c-45e0-8757-cacfcc458630/video:/ex_storage/video + - /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/daf2000:/ex_storage/daf2000 + + environment: + - MYSQL_PASSWORD=password + - MYSQL_DATABASE=nextcloud + - MYSQL_USER=nextcloud + - MYSQL_HOST=db + - REDIS_HOST=redis + entrypoint: /cron.sh + depends_on: + - nextcloud + diff --git a/homenetwork/nas/nextcloud/docker-compose.yml b/homenetwork/nas/nextcloud/docker-compose.yml index 64ea1f2..73aa31f 100644 --- a/homenetwork/nas/nextcloud/docker-compose.yml +++ b/homenetwork/nas/nextcloud/docker-compose.yml @@ -1,61 +1,46 @@ - -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 - MYSQL_DATABASE=nextcloud - MYSQL_USER=nextcloud + ports: + - 3306:3306 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 +51,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 +67,7 @@ services: environment: - password=password - username=nextcloud - - domain=vbchaos.nl + - domain=mitscherlich.nl - extra_params=--o:ssl.enable=true ports: - 9980:9980 @@ -102,9 +88,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 +105,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