diff --git a/forgejo/docker-compose.yml b/forgejo/docker-compose.yml index 07db6e6..394aa8f 100644 --- a/forgejo/docker-compose.yml +++ b/forgejo/docker-compose.yml @@ -45,7 +45,7 @@ services: - FORGEJO__database__PASSWD=${FORGEJO_DB_PASS} restart: always volumes: - - /srv/@git/git:/data + - /mnt/data/@git/git:/data - /etc/timezone:/etc/timezone:ro - /etc/localtime:/etc/localtime:ro ports: @@ -55,6 +55,7 @@ services: - forgejo db: + container_name: db image: postgres:13 restart: always environment: @@ -62,6 +63,6 @@ services: - POSTGRES_PASSWORD=${FORGEJO_DB_PASS} - POSTGRES_DB=${FORGEJO_DB_NAME} volumes: - - ./data/postgres:/var/lib/postgresql/data + - /mnt/data/@git/postgres/data/postgres:/var/lib/postgresql/data networks: - forgejo diff --git a/homeassistant/docker-compose.yml b/homeassistant/docker-compose.yml index ad922c7..42fbcac 100644 --- a/homeassistant/docker-compose.yml +++ b/homeassistant/docker-compose.yml @@ -3,7 +3,7 @@ services: container_name: homeassistant image: "ghcr.io/home-assistant/home-assistant:stable" volumes: - - ./config:/config + - /mnt/data/homeassistant:/config - /etc/localtime:/etc/localtime:ro - /run/dbus:/run/dbus:ro restart: unless-stopped diff --git a/media/docker-compose.yml b/media/docker-compose.yml index 1dd5d3a..cd91e89 100644 --- a/media/docker-compose.yml +++ b/media/docker-compose.yml @@ -1,12 +1,11 @@ -version: '3.3' services: transmission-openvpn: cap_add: - NET_ADMIN volumes: - - '/srv/@media/transmission/data:/data' - - '/srv/@media/transmission/config:/config' - - '/srv/@media/transmission/vpn:/etc/openvpn/custom' + - '/mnt/data/@media/transmission/data:/data' + - '/mnt/data/@media/transmission/config:/config' + - '/mnt/data/@media/transmission/vpn:/etc/openvpn/custom' environment: - OPENVPN_PROVIDER=custom - OPENVPN_CONFIG=fr @@ -22,9 +21,9 @@ services: options: max-size: 10m sysctls: - - net.ipv6.conf.all.disable_ipv6=0 + - net.ipv6.conf.all.disable_ipv6=1 ports: - - '9091:9091' + - 9091:9091 image: haugene/transmission-openvpn sonarr: image: lscr.io/linuxserver/sonarr:latest @@ -34,11 +33,24 @@ services: - PGID=1000 - TZ=Etc/CET volumes: - - /srv/@media/sonarr/data:/config - - /srv/@media:/media + - /mnt/data/@media/sonarr/data:/config + - /mnt/data/@media:/media ports: - 8989:8989 restart: unless-stopped + radarr: + image: lscr.io/linuxserver/radarr:latest + container_name: radarr + environment: + - PUID=1000 + - PGID=1000 + - TZ=Etc/CET + volumes: + - /mnt/data/@media/radarr/data:/config + - /mnt/data/@media:/media + ports: + - 7878:7878 + restart: unless-stopped prowlarr: image: lscr.io/linuxserver/prowlarr:latest container_name: prowlarr @@ -47,7 +59,7 @@ services: - PGID=1000 - TZ=Etc/CET volumes: - - /srv/@media/prowlarr/config:/config + - /mnt/data/@media/prowlarr/config:/config ports: - 9696:9696 restart: unless-stopped @@ -59,8 +71,9 @@ services: - PGID=1000 - TZ=Etc/UTC volumes: - - /srv/@media/bazarr/config:/config - - /srv/@media/transmission/data/completed:/tv #optional, TODO + - /mnt/data/@media/bazarr/config:/config + - /mnt/data/@media/transmission/data/completed:/tv #optional, TODO + - /mnt/data/@media:/media ports: - 6767:6767 restart: unless-stopped @@ -73,11 +86,11 @@ services: - TZ=Etc/CET - JELLYFIN_PublishedServerUrl=192.168.0.5 #optional, TODO volumes: - - /srv/@media/jellyfin/library:/config - - /srv/@media/media:/data + - /mnt/data/@media/jellyfin/library:/config + - /mnt/data/@media/media:/data ports: - 8096:8096 - 8920:8920 #optional - - 7359:7359/udp #optional - - 1900:1900/udp #optional + #- 7359:7359/udp #optional + #- 1900:1900/udp #optional restart: unless-stopped diff --git a/nextcloud/docker-compose.yml b/nextcloud/docker-compose.yml index 1dbc6b7..24b251e 100644 --- a/nextcloud/docker-compose.yml +++ b/nextcloud/docker-compose.yml @@ -4,7 +4,7 @@ services: restart: always command: --transaction-isolation=READ-COMMITTED --log-bin=binlog --binlog-format=ROW volumes: - - /srv/@nextcloud/db:/var/lib/mysql + - /mnt/data/@nextcloud/db:/var/lib/mysql environment: - MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD} - MYSQL_PASSWORD=${MYSQL_PASSWORD} @@ -22,7 +22,7 @@ services: links: - db volumes: - - /srv/@nextcloud/nextcloud:/var/www/html + - /mnt/data/@nextcloud/nextcloud:/var/www/html environment: - MYSQL_PASSWORD=${MYSQL_PASSWORD} - MYSQL_DATABASE=nextcloud diff --git a/setup.sh b/setup.sh new file mode 100755 index 0000000..ae4babf --- /dev/null +++ b/setup.sh @@ -0,0 +1,14 @@ +#!/bin/bash + +echo "Mounting..." +mount -a + +for dir in */ +do + echo "Pull&Restart ${dir}" + cd $dir + docker compose down + docker compose pull + docker compose up -d + cd .. +done