Updated compose files for local storage and removed all NFS mounts, removed unused mycroft and openvscode
This commit is contained in:
parent
4222b2f9a7
commit
5e5f3e3e01
|
@ -1,12 +1,5 @@
|
||||||
version: '3.5'
|
version: '3.5'
|
||||||
|
|
||||||
volumes:
|
|
||||||
media:
|
|
||||||
driver_opts:
|
|
||||||
type: "nfs"
|
|
||||||
o: "addr=192.168.1.245,nolock,soft,rw"
|
|
||||||
device: ":/mnt/data/media"
|
|
||||||
|
|
||||||
services:
|
services:
|
||||||
jellyfin:
|
jellyfin:
|
||||||
image: jellyfin/jellyfin
|
image: jellyfin/jellyfin
|
||||||
|
@ -16,12 +9,7 @@ services:
|
||||||
volumes:
|
volumes:
|
||||||
- ./config:/config
|
- ./config:/config
|
||||||
- ./cache:/cache
|
- ./cache:/cache
|
||||||
|
- /mnt/data/media:/media
|
||||||
- type: volume
|
|
||||||
source: media
|
|
||||||
target: /media
|
|
||||||
volume:
|
|
||||||
nocopy: true
|
|
||||||
|
|
||||||
#ports:
|
#ports:
|
||||||
# - "8096:8096/tcp"
|
# - "8096:8096/tcp"
|
||||||
|
|
|
@ -1,13 +1,5 @@
|
||||||
version: '3.1'
|
version: '3.1'
|
||||||
|
|
||||||
volumes:
|
|
||||||
|
|
||||||
data:
|
|
||||||
driver_opts:
|
|
||||||
type: "nfs"
|
|
||||||
o: "addr=192.168.1.245,nolock,soft,rw"
|
|
||||||
device: ":/mnt/data/mysql"
|
|
||||||
|
|
||||||
services:
|
services:
|
||||||
|
|
||||||
db:
|
db:
|
||||||
|
@ -16,11 +8,7 @@ services:
|
||||||
restart: always
|
restart: always
|
||||||
command: --transaction-isolation=READ-COMMITTED --binlog-format=ROW
|
command: --transaction-isolation=READ-COMMITTED --binlog-format=ROW
|
||||||
volumes:
|
volumes:
|
||||||
- type: volume
|
- /mnt/data/mysql:/var/lib/mysql
|
||||||
source: data
|
|
||||||
target: /var/lib/mysql
|
|
||||||
volume:
|
|
||||||
nocopy: false
|
|
||||||
environment:
|
environment:
|
||||||
- MARIADB_ROOT_PASSWORD=${MARIADB_ROOT_PASSWORD}
|
- MARIADB_ROOT_PASSWORD=${MARIADB_ROOT_PASSWORD}
|
||||||
- MARIADB_DATABASE=${MARIADB_DATABASE}
|
- MARIADB_DATABASE=${MARIADB_DATABASE}
|
||||||
|
|
|
@ -1,21 +1,9 @@
|
||||||
version: '3.3'
|
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:
|
services:
|
||||||
minecraft-server:
|
minecraft-server:
|
||||||
volumes:
|
volumes:
|
||||||
# - ./data:/data
|
- /mnt/data/storage/minecraft:/data
|
||||||
- type: volume
|
|
||||||
source: mc-data
|
|
||||||
target: /data
|
|
||||||
volume:
|
|
||||||
nocopy: true
|
|
||||||
|
|
||||||
environment:
|
environment:
|
||||||
- TYPE=FORGE
|
- TYPE=FORGE
|
||||||
|
|
|
@ -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
|
|
|
@ -2,11 +2,6 @@ version: '2'
|
||||||
|
|
||||||
volumes:
|
volumes:
|
||||||
app:
|
app:
|
||||||
data:
|
|
||||||
driver_opts:
|
|
||||||
type: "nfs"
|
|
||||||
o: "addr=192.168.1.245,nolock,soft,rw"
|
|
||||||
device: ":/mnt/data/nextcloud"
|
|
||||||
|
|
||||||
services:
|
services:
|
||||||
app:
|
app:
|
||||||
|
@ -17,7 +12,7 @@ services:
|
||||||
- 8080:80
|
- 8080:80
|
||||||
volumes:
|
volumes:
|
||||||
- app:/var/www/html
|
- app:/var/www/html
|
||||||
- data:/var/www/html/data
|
- /mnt/data/nextcloud:/var/www/html/data
|
||||||
environment:
|
environment:
|
||||||
- MYSQL_PASSWORD=${MYSQL_PASSWORD}
|
- MYSQL_PASSWORD=${MYSQL_PASSWORD}
|
||||||
- MYSQL_DATABASE=${MYSQL_DATABASE}
|
- MYSQL_DATABASE=${MYSQL_DATABASE}
|
||||||
|
@ -28,3 +23,6 @@ networks:
|
||||||
default:
|
default:
|
||||||
name: mariadb_default
|
name: mariadb_default
|
||||||
external: true
|
external: true
|
||||||
|
proxy:
|
||||||
|
name: proxy
|
||||||
|
external: true
|
||||||
|
|
|
@ -1,5 +1,7 @@
|
||||||
version: "3"
|
version: "3"
|
||||||
|
|
||||||
|
# Remember to run: docker network create proxy
|
||||||
|
|
||||||
networks:
|
networks:
|
||||||
proxy:
|
proxy:
|
||||||
external: true
|
external: true
|
||||||
|
|
|
@ -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
|
|
|
@ -26,23 +26,6 @@ version: '3.5'
|
||||||
# All commands may have to be prefixed with "sudo" when not running as root.
|
# 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.
|
# 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:
|
services:
|
||||||
photoprism:
|
photoprism:
|
||||||
container_name: photoprism
|
container_name: photoprism
|
||||||
|
@ -118,21 +101,9 @@ services:
|
||||||
# - "~/Import:/photoprism/import" # *Optional* base folder from which files can be imported to originals
|
# - "~/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)
|
# - "./storage:/photoprism/storage" # *Writable* storage folder for cache, database, and sidecar files (DO NOT REMOVE)
|
||||||
|
|
||||||
- type: volume
|
- /mnt/data/media/Photos/Originals:/photoprism/originals
|
||||||
source: originals
|
- /mnt/data/media/Photos/Import:/photoprism/import
|
||||||
target: /photoprism/originals
|
- /mnt/data/storage/photoprism:/photoprism/storage
|
||||||
volume:
|
|
||||||
nocopy: true
|
|
||||||
- type: volume
|
|
||||||
source: import
|
|
||||||
target: /photoprism/import
|
|
||||||
volume:
|
|
||||||
nocopy: true
|
|
||||||
- type: volume
|
|
||||||
source: storage
|
|
||||||
target: /photoprism/storage
|
|
||||||
volume:
|
|
||||||
nocopy: true
|
|
||||||
|
|
||||||
## -- (database server section removed; use separate mariadb container)
|
## -- (database server section removed; use separate mariadb container)
|
||||||
|
|
||||||
|
|
|
@ -2,18 +2,6 @@
|
||||||
# APPDESCRIPTION=An organizer for your ****, written in Go
|
# APPDESCRIPTION=An organizer for your ****, written in Go
|
||||||
version: '3.4'
|
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:
|
services:
|
||||||
stash:
|
stash:
|
||||||
image: stashapp/stash:latest
|
image: stashapp/stash:latest
|
||||||
|
@ -30,29 +18,18 @@ services:
|
||||||
max-file: "10"
|
max-file: "10"
|
||||||
max-size: "2m"
|
max-size: "2m"
|
||||||
environment:
|
environment:
|
||||||
- STASH_STASH=/ext/data/
|
- STASH_STASH=data/
|
||||||
- STASH_GENERATED=/ext/generated/
|
- STASH_GENERATED=generated/
|
||||||
- STASH_METADATA=/ext/metadata/
|
- STASH_METADATA=metadata/
|
||||||
- STASH_CACHE=/ext/cache/
|
- STASH_CACHE=cache/
|
||||||
## Adjust below to change default port (9999)
|
## Adjust below to change default port (9999)
|
||||||
- STASH_PORT=9999
|
- STASH_PORT=9999
|
||||||
volumes:
|
volumes:
|
||||||
- /etc/localtime:/etc/localtime:ro
|
- /etc/localtime:/etc/localtime:ro
|
||||||
## Adjust below paths (the left part) to your liking.
|
## Adjust below paths (the left part) to your liking.
|
||||||
## E.g. you can change ./config:/root/.stash to ./stash:/root/.stash
|
## E.g. you can change ./config:/root/.stash to ./stash:/root/.stash
|
||||||
|
- /mnt/data/storage/stash-meta/config:/root/.stash
|
||||||
## Keep configs, scrapers, and plugins here.
|
- /mnt/data/storage/stash-meta/metadata:/metadata
|
||||||
- ./config:/root/.stash
|
- /mnt/data/storage/stash-meta/cache:/cache
|
||||||
## Point this at your collection.
|
- /mnt/data/storage/stash-meta/generated:/generated
|
||||||
#- ./data:/data
|
- /mnt/data/storage/stash:/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
|
|
||||||
|
|
|
@ -1,12 +1,5 @@
|
||||||
version: "2.1"
|
version: "2.1"
|
||||||
|
|
||||||
volumes:
|
|
||||||
download_data:
|
|
||||||
driver_opts:
|
|
||||||
type: "nfs"
|
|
||||||
o: "addr=192.168.1.245,nolock,soft,rw"
|
|
||||||
device: ":/mnt/data/downloads"
|
|
||||||
|
|
||||||
services:
|
services:
|
||||||
transmission:
|
transmission:
|
||||||
image: lscr.io/linuxserver/transmission:latest
|
image: lscr.io/linuxserver/transmission:latest
|
||||||
|
@ -23,11 +16,7 @@ services:
|
||||||
- HOST_WHITELIST= #optional
|
- HOST_WHITELIST= #optional
|
||||||
volumes:
|
volumes:
|
||||||
- ./data:/config
|
- ./data:/config
|
||||||
- type: volume
|
- /mnt/data/downloads:/downloads
|
||||||
source: download_data
|
|
||||||
target: /downloads
|
|
||||||
volume:
|
|
||||||
nocopy: false
|
|
||||||
ports:
|
ports:
|
||||||
- 9091:9091
|
- 9091:9091
|
||||||
- 51413:51413
|
- 51413:51413
|
||||||
|
|
Loading…
Reference in New Issue