Merge branch 'main' into dev

catch up dev
This commit is contained in:
poslop
2023-12-04 21:26:57 -06:00

View File

@@ -15,11 +15,11 @@ services:
image: lscr.io/linuxserver/prowlarr:latest image: lscr.io/linuxserver/prowlarr:latest
container_name: prowlarr container_name: prowlarr
environment: environment:
- PUID=1105 - PUID=1000
- PGID=1105 - PGID=1000
- TZ=Etc/UTC - TZ=Etc/UTC
volumes: volumes:
- /docker/store/prowlarr:/config - /mnt/docker/configs/prowlarr:/config
ports: ports:
- 9696:9696 - 9696:9696
restart: unless-stopped restart: unless-stopped
@@ -31,14 +31,11 @@ services:
image: lscr.io/linuxserver/sonarr:latest image: lscr.io/linuxserver/sonarr:latest
container_name: sonarr container_name: sonarr
environment: environment:
- PUID=1106 - PUID=1000
- PGID=1106 - PGID=1000
- TZ=Etc/UTC - TZ=Etc/UTC
#user: 1106:1106
group_add:
- "1103"
volumes: volumes:
- /docker/store/sonarr:/config - /mnt/docker/configs/sonarr:/config
- /mnt/massdrive/media:/mnt/media - /mnt/massdrive/media:/mnt/media
ports: ports:
- 8989:8989 - 8989:8989
@@ -47,36 +44,16 @@ services:
- arr - arr
- qbit - qbit
radarr:
image: lscr.io/linuxserver/radarr:latest
container_name: radarr
environment:
- PUID=1107
- PGID=1107
- TZ=Etc/UTC
volumes:
- /docker/store/radarr:/config
- /mnt/massdrive/media:/mnt/media
ports:
- 7878:7878
restart: unless-stopped
networks:
- arr
- qbit
qbittorrent: qbittorrent:
image: lscr.io/linuxserver/qbittorrent:latest image: lscr.io/linuxserver/qbittorrent:latest
container_name: qbittorrent container_name: qbittorrent
environment: environment:
- PUID=1108 - PUID=1000
- PGID=1108 - PGID=1000
- TZ=Etc/UTC - TZ=Etc/UTC
- WEBUI_PORT=8181 - WEBUI_PORT=8181
group_add:
- "1103"
volumes: volumes:
- /docker/store/qbittorrent/config:/config - /mnt/docker/configs/qbittorrent/config:/config
- /mnt/nextcloud:/mnt/files - /mnt/nextcloud:/mnt/files
ports: ports:
- 8181:8181 - 8181:8181
@@ -92,13 +69,13 @@ services:
image: shokoanime/server:daily image: shokoanime/server:daily
restart: always restart: always
environment: environment:
- PUID=1102 - "PUID=1000"
- PGID=1102 - "PGID=1000"
- "TZ=Etc/UTC" - "TZ=Etc/UTC"
ports: ports:
- "8111:8111" - "8111:8111"
volumes: volumes:
- /docker/store/shoko:/home/shoko/.shoko - /mnt/docker/configs/shoko:/home/shoko/.shoko
- /mnt/massdrive/media:/mnt/media - /mnt/massdrive/media:/mnt/media
networks: networks:
- shoko - shoko
@@ -114,33 +91,12 @@ services:
SIGNUPS_ALLOWED: false SIGNUPS_ALLOWED: false
ADMIN_TOKEN: ${PASS} ADMIN_TOKEN: ${PASS}
volumes: volumes:
- /docker/store/vaultwarden:/data - /mnt/docker/configs/vaultwarden:/data
networks: networks:
- swag - swag
ports: ports:
- 8089:80 - 8089:80
wolf:
container_name: wolf
image: ghcr.io/games-on-whales/wolf:stable
environment:
- XDG_RUNTIME_DIR=/tmp/sockets
- HOST_APPS_STATE_FOLDER=/docker/store/wolf/etc
- WOLF_LOG_LEVEL=DEBUG
volumes:
- /docker/store/wolf/wolf:/wolf/cfg
- /tmp/sockets:/tmp/sockets:rw
- /var/run/docker.sock:/var/run/docker.sock:rw
- /dev/shm:/dev/shm:rw
- /dev/input:/dev/input:rw
- /run/udev:/run/udev:rw
devices:
- /dev/dri:/dev/dri
- /dev/uinput:/dev/uinput
device_cgroup_rules:
- 'c 13:* rmw'
network_mode: host
restart: unless-stopped
monerod: monerod:
image: sethsimmons/simple-monerod:latest image: sethsimmons/simple-monerod:latest
@@ -188,7 +144,7 @@ services:
restart: unless-stopped restart: unless-stopped
volumes: volumes:
- /mnt/nextcloud:/aria2/data - /mnt/nextcloud:/aria2/data
- /docker/store/aria:/aria2/conf - /mnt/docker/configs/aria:/aria2/conf
environment: environment:
- PUID=1000 - PUID=1000
- PGID=1000 - PGID=1000
@@ -206,7 +162,7 @@ services:
environment: environment:
- BASE_URL=https://searxng.mintyserver.net - BASE_URL=https://searxng.mintyserver.net
volumes: volumes:
- /docker/store/searxng:/etc/searxng - /mnt/docker/configs/searxng:/etc/searxng
# ports: # ports:
# - 8998:8080 # - 8998:8080
restart: unless-stopped restart: unless-stopped
@@ -218,15 +174,15 @@ services:
container_name: puffer container_name: puffer
restart: always restart: always
environment: environment:
- PUFFER_DAEMON_DATA_SERVERS=/docker/store/puffer/lib/servers - PUFFER_DAEMON_DATA_SERVERS=/mnt/docker/configs/puffer/lib/servers
#ports: #ports:
# - 8081:8080 # - 8081:8080
# - 5657:5657 # - 5657:5657
volumes: volumes:
- /docker/store/puffer/pufferpanel-config:/etc/pufferpanel - /mnt/docker/configs/puffer/pufferpanel-config:/etc/pufferpanel
- /docker/store/puffer/lib:/var/lib/pufferpanel - /mnt/docker/configs/puffer/lib:/var/lib/pufferpanel
- /var/run/docker.sock:/var/run/docker.sock - /var/run/docker.sock:/var/run/docker.sock
- /docker/store/puffer/lib/servers:/docker/store/puffer/lib/servers - /mnt/docker/configs/puffer/lib/servers:/docker/store/puffer/lib/servers
networks: networks:
- swag - swag
@@ -238,7 +194,7 @@ services:
- USER_GID=1000 - USER_GID=1000
restart: always restart: always
volumes: volumes:
- /docker/store/gitea:/data - /mnt/docker/configs/gitea:/data
- /etc/timezone:/etc/timezone:ro - /etc/timezone:/etc/timezone:ro
- /etc/localtime:/etc/localtime:ro - /etc/localtime:/etc/localtime:ro
#ports: #ports:
@@ -255,7 +211,7 @@ services:
- PUID=1000 - PUID=1000
- PGID=1000 - PGID=1000
volumes: volumes:
- /docker/store/syncthing/config:/config - /mnt/docker/configs/syncthing/config:/config
- /home/poslop:/data - /home/poslop:/data
ports: ports:
- 8384:8384 - 8384:8384
@@ -268,11 +224,10 @@ services:
pihole: pihole:
container_name: pihole container_name: pihole
image: pihole/pihole:latest image: pihole/pihole:latest
# For DHCP it is recommended to remove these ports and instead add: network_mode: "host"
ports: ports:
- "53:53/tcp" - "53:53/tcp"
- "53:53/udp" - "53:53/udp"
- "67:67/udp" # Only required if you are using Pi-hole as your DHCP server - "67:67/udp"
- "8088:80/tcp" - "8088:80/tcp"
dns: dns:
- 127.0.0.1 - 127.0.0.1
@@ -280,13 +235,11 @@ services:
environment: environment:
TZ: 'America/Chicago' TZ: 'America/Chicago'
WEBPASSWORD: ${PASS} WEBPASSWORD: ${PASS}
# Volumes store your data between container upgrades
volumes: volumes:
- '/docker/store/pihole/etc-pihole:/etc/pihole' - '/mnt/docker/configs/pihole/etc-pihole:/etc/pihole'
- '/docker/store/pihole/etc-dnsmasq.d:/etc/dnsmasq.d' - '/mnt/docker/configs/pihole/etc-dnsmasq.d:/etc/dnsmasq.d'
# https://github.com/pi-hole/docker-pi-hole#note-on-capabilities
cap_add: cap_add:
- NET_ADMIN # Required if you are using Pi-hole as your DHCP server, else not needed - NET_ADMIN
restart: unless-stopped restart: unless-stopped
jellyfin: jellyfin:
@@ -295,11 +248,11 @@ services:
devices: devices:
- /dev/dri:/dev/dri - /dev/dri:/dev/dri
environment: environment:
- PUID=1104 - PUID=1000
- PGID=1104 - PGID=1000
- TZ=America/Chicago - TZ=America/Chicago
volumes: volumes:
- /docker/store/jellyfin:/config - /mnt/docker/configs/jellyfin:/config
- /mnt/massdrive/media:/data - /mnt/massdrive/media:/data
# ports: # ports:
# - 7359:7359/udp # - 7359:7359/udp
@@ -315,10 +268,10 @@ services:
image: lscr.io/linuxserver/swag:latest image: lscr.io/linuxserver/swag:latest
restart: unless-stopped restart: unless-stopped
volumes: volumes:
- /docker/store/swag:/config - /mnt/docker/configs/swag:/config
environment: environment:
- PUID=1101 - PUID=1000
- PGID=1101 - PGID=1000
- TZ=America/Chicago - TZ=America/Chicago
- URL=mintyserver.net - URL=mintyserver.net
- VALIDATION=http - VALIDATION=http
@@ -344,7 +297,7 @@ services:
environment: environment:
- APACHE_PORT=11000 - APACHE_PORT=11000
- APACHE_IP_BINDING=0.0.0.0 - APACHE_IP_BINDING=0.0.0.0
- NEXTCLOUD_DATADIR=/docker/store/ncaio - NEXTCLOUD_DATADIR=/mnt/docker/configs/ncaio
- NEXTCLOUD_MOUNT=/mnt/nextcloud/ - NEXTCLOUD_MOUNT=/mnt/nextcloud/
- NEXTCLOUD_MEMORY_LIMIT=4096M - NEXTCLOUD_MEMORY_LIMIT=4096M