1
0
Fork 0

master-compose:

- removed domain-specific networks (except for network-torrent)
 - rename transmission and wireguard containers
 - change mount volumes too
This commit is contained in:
Pratham Patel 2022-08-19 01:27:28 +05:30
parent 5a0b53c305
commit 3809ec65ea
1 changed files with 36 additions and 47 deletions

View File

@ -22,13 +22,12 @@ services:
- pratham.container.category=proxy - pratham.container.category=proxy
environment: environment:
- TZ=Asia/Kolkata - TZ=Asia/Kolkata
# depends_on: depends_on:
# - gitea-web - gitea-web
# - thefossguy-blog - thefossguy-blog
# - nextcloud-web - nextcloud-web
# - thefossguy-mach - thefossguy-mach
networks: - transmission-raadhe
- network-caddy
gitea-web: gitea-web:
@ -68,8 +67,6 @@ services:
- gitea-db - gitea-db
secrets: secrets:
- gitea_database_user_password - gitea_database_user_password
networks:
- network-gitea
gitea-db: gitea-db:
@ -88,8 +85,6 @@ services:
- TZ=Asia/Kolkata - TZ=Asia/Kolkata
secrets: secrets:
- gitea_database_user_password - gitea_database_user_password
networks:
- network-gitea
thefossguy-blog: thefossguy-blog:
@ -106,8 +101,6 @@ services:
- pratham.container.category=blog - pratham.container.category=blog
environment: environment:
- TZ=Asia/Kolkata - TZ=Asia/Kolkata
networks:
- network-blog
nextcloud-web: nextcloud-web:
@ -134,8 +127,6 @@ services:
- nextcloud-db - nextcloud-db
secrets: secrets:
- nextcloud_database_user_password - nextcloud_database_user_password
networks:
- network-nextcloud
nextcloud-db: nextcloud-db:
@ -154,8 +145,6 @@ services:
- TZ=Asia/Kolkata - TZ=Asia/Kolkata
secrets: secrets:
- nextcloud_database_user_password - nextcloud_database_user_password
networks:
- network-nextcloud
nextcloud-cron: nextcloud-cron:
@ -173,8 +162,6 @@ services:
depends_on: depends_on:
- nextcloud-web - nextcloud-web
- nextcloud-db - nextcloud-db
networks:
- network-nextcloud
thefossguy-mach: thefossguy-mach:
@ -191,44 +178,44 @@ services:
- pratham.container.category=mach - pratham.container.category=mach
environment: environment:
- TZ=Asia/Kolkata - TZ=Asia/Kolkata
networks:
- network-mach
wireguard-client: wireguard-client:
image: lscr.io/linuxserver/wireguard:latest image: lscr.io/linuxserver/wireguard:latest
container_name: wireguard-rahu container_name: wireguard-shyaam
restart: always restart: always
ports: ports:
- "8050:51820/udp" - "8050:9091" # transmission web-ui
- "8051:51413" # transmission; idk what
- "8052:51413/udp" # transmission; idk what
- "8053:51820/udp" # wireguard
volumes: volumes:
- /trayimurti/containers/volumes/wireguard:/config:Z - /trayimurti/torrents/wg-conf:/config:Z
- /lib/modules:/lib/modules:ro - /lib/modules:/lib/modules:ro
labels: labels:
- io.containers.autoupdate=registry - io.containers.autoupdate=registry
- pratham.container.category=torrent - pratham.container.category=torrent
environment:
# - SERVERURL=auto # determine and set external IP automatically
# - SERVERPORT=51820
- TZ=Asia/Kolkata
cap_add: cap_add:
- NET_ADMIN - NET_ADMIN
- SYS_MODULE - SYS_MODULE
environment:
- SERVERURL=auto # determine and set external IP automatically
- SERVERPORT=51820
- TZ=Asia/Kolkata
sysctls: sysctls:
- net.ipv4.conf.all.src_valid_mark=1 - net.ipv4.conf.all.src_valid_mark=1
networks: networks:
- network-torrent - network-torr
- container-compose_default
transmission-web: transmission-web:
image: lscr.io/linuxserver/transmission:latest image: lscr.io/linuxserver/transmission:latest
container_name: transmission-ketu container_name: transmission-raadhe
restart: always restart: always
ports:
- "8060:9091"
- "8061:51413"
- "8062:51413/udp"
volumes: volumes:
- /trayimurti/torrents/:/downloads:Z - /trayimurti/torrents/downloads:/downloads:Z
- /trayimurti/torrents/.config:/config:Z - /trayimurti/torrents/config:/config:Z
labels: labels:
- io.containers.autoupdate=registry - io.containers.autoupdate=registry
- pratham.container.category=torrent - pratham.container.category=torrent
@ -236,8 +223,11 @@ services:
- TZ=Asia/Kolkata - TZ=Asia/Kolkata
depends_on: depends_on:
- wireguard-client - wireguard-client
# network_mode: 'service:wireguard-shyaam'
networks: networks:
network-torrent - network-torr
- container-compose_default
secrets: secrets:
gitea_database_user_password: gitea_database_user_password:
@ -245,18 +235,17 @@ secrets:
nextcloud_database_user_password: nextcloud_database_user_password:
external: true external: true
networks: networks:
network-caddy: network-torr:
network-gitea: container-compose_default:
network-blog: external:
network-nextcloud: true
network-mach:
network-torrent:
# SERVICE_TEMPLATE # SERVICE_TEMPLATE
# service: # service:
# image: # image:
# container_name: # container_name:
# command OR entrypoint: # command OR entrypoint:
# restart: always # restart: always
# ports: # ports:
@ -264,10 +253,10 @@ networks:
# labels: # labels:
# - io.containers.autoupdate=registry # - io.containers.autoupdate=registry
# - pratham.container.category= # - pratham.container.category=
# cap_add:
# sysctls:
# environment: # environment:
# - TZ=Asia/Kolkata # - TZ=Asia/Kolkata
# sysctls:
# cap_add:
# depends_on: # depends_on:
# secrets: # secrets:
# networks: # networks: