From 5e5f3e3e010c1699c52d822e591f0f06f0a06b6d Mon Sep 17 00:00:00 2001 From: Thord Johansson Date: Fri, 10 Mar 2023 13:19:54 +0100 Subject: [PATCH] Updated compose files for local storage and removed all NFS mounts, removed unused mycroft and openvscode --- jellyfin/docker-compose.yml | 14 +---------- mariadb/docker-compose.yml | 14 +---------- minecraft/docker-compose.yml | 14 +---------- mycroft/docker-compose.yml | 27 --------------------- nextcloud/docker-compose.yml | 10 +++----- nginx-proxy/docker-compose.yml | 2 ++ openvscode/docker-compose.yml | 10 -------- photoprism/docker-compose.yml | 35 +++------------------------ stash/docker-compose.yml | 43 ++++++++------------------------- transmission/docker-compose.yml | 13 +--------- 10 files changed, 23 insertions(+), 159 deletions(-) delete mode 100644 mycroft/docker-compose.yml delete mode 100644 openvscode/docker-compose.yml diff --git a/jellyfin/docker-compose.yml b/jellyfin/docker-compose.yml index 5a7a333..dfdad23 100644 --- a/jellyfin/docker-compose.yml +++ b/jellyfin/docker-compose.yml @@ -1,12 +1,5 @@ version: '3.5' -volumes: - media: - driver_opts: - type: "nfs" - o: "addr=192.168.1.245,nolock,soft,rw" - device: ":/mnt/data/media" - services: jellyfin: image: jellyfin/jellyfin @@ -16,12 +9,7 @@ services: volumes: - ./config:/config - ./cache:/cache - - - type: volume - source: media - target: /media - volume: - nocopy: true + - /mnt/data/media:/media #ports: # - "8096:8096/tcp" diff --git a/mariadb/docker-compose.yml b/mariadb/docker-compose.yml index 6147ee1..81a0fc5 100644 --- a/mariadb/docker-compose.yml +++ b/mariadb/docker-compose.yml @@ -1,13 +1,5 @@ version: '3.1' -volumes: - - data: - driver_opts: - type: "nfs" - o: "addr=192.168.1.245,nolock,soft,rw" - device: ":/mnt/data/mysql" - services: db: @@ -16,11 +8,7 @@ services: restart: always command: --transaction-isolation=READ-COMMITTED --binlog-format=ROW volumes: - - type: volume - source: data - target: /var/lib/mysql - volume: - nocopy: false + - /mnt/data/mysql:/var/lib/mysql environment: - MARIADB_ROOT_PASSWORD=${MARIADB_ROOT_PASSWORD} - MARIADB_DATABASE=${MARIADB_DATABASE} diff --git a/minecraft/docker-compose.yml b/minecraft/docker-compose.yml index 51956bf..38ea619 100644 --- a/minecraft/docker-compose.yml +++ b/minecraft/docker-compose.yml @@ -1,21 +1,9 @@ version: '3.3' -volumes: - mc-data: - driver_opts: - type: "nfs" - o: "addr=192.168.1.245,nolock,soft,rw" - device: ":/mnt/data/storage/minecraft" - services: minecraft-server: volumes: - # - ./data:/data - - type: volume - source: mc-data - target: /data - volume: - nocopy: true + - /mnt/data/storage/minecraft:/data environment: - TYPE=FORGE diff --git a/mycroft/docker-compose.yml b/mycroft/docker-compose.yml deleted file mode 100644 index 4f9d377..0000000 --- a/mycroft/docker-compose.yml +++ /dev/null @@ -1,27 +0,0 @@ -version: '3' -services: - mycroft: - image: mycroft - container_name: mycroft - hostname: mycroft - restart: always - ports: - - 8181:8181 - volumes: - - ./persisted:/root/.mycroft - - ./config:/root/.config/mycroft/ - - ./skills:/opt/mycroft/skills - - ${HOME}/.config/pulse/cookie:/root/.config/pulse/cookie - - ${XDG_RUNTIME_DIR}/pulse/native:${XDG_RUNTIME_DIR}/pulse/native - - /etc/machine-id:/etc/machine-id - - /var/lib/dbus:/var/lib/dbus - environment: - - PULSE_SERVER=unix:${XDG_RUNTIME_DIR}/pulse/native - - XDG_RUNTIME_DIR=${XDG_RUNTIME_DIR} - devices: - - /dev/snd:/dev/snd -# - /dev/${SYSTEM_DEVICE_TTY}:/dev/${SYSTEM_DEVICE_TTY} - -volumes: - skills: - driver: local diff --git a/nextcloud/docker-compose.yml b/nextcloud/docker-compose.yml index a927b21..513fb58 100644 --- a/nextcloud/docker-compose.yml +++ b/nextcloud/docker-compose.yml @@ -2,11 +2,6 @@ version: '2' volumes: app: - data: - driver_opts: - type: "nfs" - o: "addr=192.168.1.245,nolock,soft,rw" - device: ":/mnt/data/nextcloud" services: app: @@ -17,7 +12,7 @@ services: - 8080:80 volumes: - app:/var/www/html - - data:/var/www/html/data + - /mnt/data/nextcloud:/var/www/html/data environment: - MYSQL_PASSWORD=${MYSQL_PASSWORD} - MYSQL_DATABASE=${MYSQL_DATABASE} @@ -28,3 +23,6 @@ networks: default: name: mariadb_default external: true + proxy: + name: proxy + external: true diff --git a/nginx-proxy/docker-compose.yml b/nginx-proxy/docker-compose.yml index ccdf453..8e9856f 100644 --- a/nginx-proxy/docker-compose.yml +++ b/nginx-proxy/docker-compose.yml @@ -1,5 +1,7 @@ version: "3" +# Remember to run: docker network create proxy + networks: proxy: external: true diff --git a/openvscode/docker-compose.yml b/openvscode/docker-compose.yml deleted file mode 100644 index 07078b6..0000000 --- a/openvscode/docker-compose.yml +++ /dev/null @@ -1,10 +0,0 @@ -version: '3.3' -services: - openvscode-server: - ports: - - '3000:3000' - volumes: - - '${DEV_HOME}:/home/workspace:cached' - image: gitpod/openvscode-server - container_name: openvscode - network_mode: host diff --git a/photoprism/docker-compose.yml b/photoprism/docker-compose.yml index 632f2c6..1d22a59 100644 --- a/photoprism/docker-compose.yml +++ b/photoprism/docker-compose.yml @@ -26,23 +26,6 @@ version: '3.5' # All commands may have to be prefixed with "sudo" when not running as root. # This will point the home directory shortcut ~ to /root in volume mounts. -volumes: - originals: - driver_opts: - type: "nfs" - o: "addr=192.168.1.245,nolock,soft,rw" - device: ":/mnt/data/media/Photos/Originals" - import: - driver_opts: - type: "nfs" - o: "addr=192.168.1.245,nolock,soft,rw" - device: ":/mnt/data/media/Photos/Import" - storage: - driver_opts: - type: "nfs" - o: "addr=192.168.1.245,nolock,soft,rw" - device: ":/mnt/data/storage/photoprism" - services: photoprism: container_name: photoprism @@ -118,21 +101,9 @@ services: # - "~/Import:/photoprism/import" # *Optional* base folder from which files can be imported to originals # - "./storage:/photoprism/storage" # *Writable* storage folder for cache, database, and sidecar files (DO NOT REMOVE) - - type: volume - source: originals - target: /photoprism/originals - volume: - nocopy: true - - type: volume - source: import - target: /photoprism/import - volume: - nocopy: true - - type: volume - source: storage - target: /photoprism/storage - volume: - nocopy: true + - /mnt/data/media/Photos/Originals:/photoprism/originals + - /mnt/data/media/Photos/Import:/photoprism/import + - /mnt/data/storage/photoprism:/photoprism/storage ## -- (database server section removed; use separate mariadb container) diff --git a/stash/docker-compose.yml b/stash/docker-compose.yml index ed589a2..afaf4fe 100644 --- a/stash/docker-compose.yml +++ b/stash/docker-compose.yml @@ -2,18 +2,6 @@ # APPDESCRIPTION=An organizer for your ****, written in Go version: '3.4' -volumes: - content: - driver_opts: - type: "nfs" - o: "addr=192.168.1.245,nolock,soft,rw" - device: ":/mnt/data/storage/stash" - meta: - driver_opts: - type: "nfs" - o: "addr=192.168.1.245,nolock,soft,rw" - device: ":/mnt/data/storage/stash/.metadata" - services: stash: image: stashapp/stash:latest @@ -30,29 +18,18 @@ services: max-file: "10" max-size: "2m" environment: - - STASH_STASH=/ext/data/ - - STASH_GENERATED=/ext/generated/ - - STASH_METADATA=/ext/metadata/ - - STASH_CACHE=/ext/cache/ + - STASH_STASH=data/ + - STASH_GENERATED=generated/ + - STASH_METADATA=metadata/ + - STASH_CACHE=cache/ ## Adjust below to change default port (9999) - STASH_PORT=9999 volumes: - /etc/localtime:/etc/localtime:ro ## Adjust below paths (the left part) to your liking. - ## E.g. you can change ./config:/root/.stash to ./stash:/root/.stash - - ## Keep configs, scrapers, and plugins here. - - ./config:/root/.stash - ## Point this at your collection. - #- ./data:/data - ## This is where your stash's metadata lives - - ./metadata:/metadata - ## Any other cache content. - - ./cache:/cache - ## Where to store generated content (screenshots,previews,transcodes,sprites) - - ./generated:/generated - - type: volume - source: content - target: /data - volume: - nocopy: true + ## E.g. you can change ./config:/root/.stash to ./stash:/root/.stash + - /mnt/data/storage/stash-meta/config:/root/.stash + - /mnt/data/storage/stash-meta/metadata:/metadata + - /mnt/data/storage/stash-meta/cache:/cache + - /mnt/data/storage/stash-meta/generated:/generated + - /mnt/data/storage/stash:/data diff --git a/transmission/docker-compose.yml b/transmission/docker-compose.yml index 870ab36..1ed0990 100644 --- a/transmission/docker-compose.yml +++ b/transmission/docker-compose.yml @@ -1,12 +1,5 @@ version: "2.1" -volumes: - download_data: - driver_opts: - type: "nfs" - o: "addr=192.168.1.245,nolock,soft,rw" - device: ":/mnt/data/downloads" - services: transmission: image: lscr.io/linuxserver/transmission:latest @@ -23,11 +16,7 @@ services: - HOST_WHITELIST= #optional volumes: - ./data:/config - - type: volume - source: download_data - target: /downloads - volume: - nocopy: false + - /mnt/data/downloads:/downloads ports: - 9091:9091 - 51413:51413