update invidious config, again
This commit is contained in:
parent
537028066d
commit
3f9803b22b
2 changed files with 23 additions and 8 deletions
|
@ -3,6 +3,7 @@
|
||||||
# https://docs.docker.com/compose/how-tos/multiple-compose-files/include/
|
# https://docs.docker.com/compose/how-tos/multiple-compose-files/include/
|
||||||
include:
|
include:
|
||||||
- ../valkey-invidious/docker-compose.yml
|
- ../valkey-invidious/docker-compose.yml
|
||||||
|
- ../invidious-companion/docker-compose.yml
|
||||||
|
|
||||||
# https://docs.docker.com/reference/compose-file/extension/
|
# https://docs.docker.com/reference/compose-file/extension/
|
||||||
x-common-env: &common-env
|
x-common-env: &common-env
|
||||||
|
@ -12,12 +13,16 @@ x-common-env: &common-env
|
||||||
INVIDIOUS_ALTERNATIVE_DOMAINS: '["inv.nadeko.net", "inv.nadekonw7plitnjuawu6ytjsl7jlglk2t6pyq6eftptmiv3dvqndwvyd.onion"]'
|
INVIDIOUS_ALTERNATIVE_DOMAINS: '["inv.nadeko.net", "inv.nadekonw7plitnjuawu6ytjsl7jlglk2t6pyq6eftptmiv3dvqndwvyd.onion"]'
|
||||||
INVIDIOUS_BACKEND_DOMAINS: '["inv1.nadeko.net", "inv2.nadeko.net", "inv3.nadeko.net", "inv4.nadeko.net", "inv5.nadeko.net"]'
|
INVIDIOUS_BACKEND_DOMAINS: '["inv1.nadeko.net", "inv2.nadeko.net", "inv3.nadeko.net", "inv4.nadeko.net", "inv5.nadeko.net"]'
|
||||||
|
|
||||||
|
# https://docs.docker.com/reference/compose-file/extension/
|
||||||
|
x-common-dep: &common-dep
|
||||||
|
depends_on: ["pgbouncer"]
|
||||||
|
|
||||||
x-common: &common
|
x-common: &common
|
||||||
hostname: invidious
|
hostname: invidious
|
||||||
env_file:
|
env_file:
|
||||||
# Env file containing INVIDIOUS_* variables
|
# Env file containing INVIDIOUS_* variables
|
||||||
- .env
|
- .env
|
||||||
image: "git.nadeko.net/fijxu/invidious-with-companion:latest"
|
image: "git.nadeko.net/fijxu/invidious:latest"
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
mem_limit: 512MB
|
mem_limit: 512MB
|
||||||
cpus: 0.25
|
cpus: 0.25
|
||||||
|
@ -27,8 +32,8 @@ x-common: &common
|
||||||
# Volume is not needed anymore since I use pgbouncer now
|
# Volume is not needed anymore since I use pgbouncer now
|
||||||
# - /var/run/postgresql/.s.PGSQL.5432:/var/run/postgresql/.s.PGSQL.5432:rw
|
# - /var/run/postgresql/.s.PGSQL.5432:/var/run/postgresql/.s.PGSQL.5432:rw
|
||||||
- ./config.yml:/etc/invidious/config.yml:ro
|
- ./config.yml:/etc/invidious/config.yml:ro
|
||||||
logging:
|
# logging:
|
||||||
driver: none
|
# driver: none
|
||||||
# Watchtower checks in intervals of 60 seconds for fast container updates.
|
# Watchtower checks in intervals of 60 seconds for fast container updates.
|
||||||
# It needs to have a scope or Watchtower will spam docker servers asking
|
# It needs to have a scope or Watchtower will spam docker servers asking
|
||||||
# for a new image update therefore rate limiting me
|
# for a new image update therefore rate limiting me
|
||||||
|
@ -48,15 +53,18 @@ services:
|
||||||
<<: *common
|
<<: *common
|
||||||
environment:
|
environment:
|
||||||
<<: *common-env
|
<<: *common-env
|
||||||
INVIDIOUS_INVIDIOUS_COMPANION: '[{"private_url": "https://inv-cl2.nadeko.net:8448", "public_url": "https://inv-cl2.nadeko.net:8448"}]'
|
INVIDIOUS_INVIDIOUS_COMPANION: '[{"private_url": "https://inv-cl2-c.nadeko.net:8443", "public_url": "https://inv-cl2-c.nadeko.net:8443"}]'
|
||||||
|
INVIDIOUS_EXTERNAL_VIDEOPLAYBACK_PROXY: '["https://inv-cl2.nadeko.net:8443"]'
|
||||||
networks: ["invidious"]
|
networks: ["invidious"]
|
||||||
|
#depends_on: ["valkey", "haproxy", "companion1"]
|
||||||
depends_on: ["valkey", "haproxy"]
|
depends_on: ["valkey", "haproxy"]
|
||||||
|
|
||||||
invidious2:
|
invidious2:
|
||||||
<<: *common
|
<<: *common
|
||||||
environment:
|
environment:
|
||||||
<<: *common-env
|
<<: *common-env
|
||||||
INVIDIOUS_INVIDIOUS_COMPANION: '[{"private_url": "https://inv-ca1.nadeko.net:8448", "public_url": "https://inv-ca1.nadeko.net:8448"}]'
|
INVIDIOUS_INVIDIOUS_COMPANION: '[{"private_url": "https://inv-ca1-c.nadeko.net", "public_url": "https://inv-ca1-c.nadeko.net"}]'
|
||||||
|
INVIDIOUS_EXTERNAL_VIDEOPLAYBACK_PROXY: '["https://inv-ca1.nadeko.net"]'
|
||||||
networks: ["invidious2"]
|
networks: ["invidious2"]
|
||||||
depends_on: ["valkey2", "haproxy2"]
|
depends_on: ["valkey2", "haproxy2"]
|
||||||
|
|
||||||
|
@ -64,7 +72,8 @@ services:
|
||||||
<<: *common
|
<<: *common
|
||||||
environment:
|
environment:
|
||||||
<<: *common-env
|
<<: *common-env
|
||||||
INVIDIOUS_INVIDIOUS_COMPANION: '[{"private_url": "https://inv-us2.nadeko.net:8448", "public_url": "https://inv-us2.nadeko.net:8448"}]'
|
INVIDIOUS_INVIDIOUS_COMPANION: '[{"private_url": "https://inv-us2-c.nadeko.net", "public_url": "https://inv-us2-c.nadeko.net"}]'
|
||||||
|
INVIDIOUS_EXTERNAL_VIDEOPLAYBACK_PROXY: '["https://inv-us2.nadeko.net"]'
|
||||||
networks: ["invidious3"]
|
networks: ["invidious3"]
|
||||||
depends_on: ["valkey3", "haproxy3"]
|
depends_on: ["valkey3", "haproxy3"]
|
||||||
|
|
||||||
|
@ -72,7 +81,8 @@ services:
|
||||||
<<: *common
|
<<: *common
|
||||||
environment:
|
environment:
|
||||||
<<: *common-env
|
<<: *common-env
|
||||||
INVIDIOUS_INVIDIOUS_COMPANION: '[{"private_url": "https://inv-eu1.nadeko.net:8448", "public_url": "https://inv-eu1.nadeko.net:8448"}]'
|
INVIDIOUS_INVIDIOUS_COMPANION: '[{"private_url": "https://inv-eu1-c.nadeko.net", "public_url": "https://inv-eu1-c.nadeko.net"}]'
|
||||||
|
INVIDIOUS_EXTERNAL_VIDEOPLAYBACK_PROXY: '["https://inv-eu1.nadeko.net"]'
|
||||||
networks: ["invidious4"]
|
networks: ["invidious4"]
|
||||||
depends_on: ["valkey4", "haproxy4"]
|
depends_on: ["valkey4", "haproxy4"]
|
||||||
|
|
||||||
|
@ -80,7 +90,8 @@ services:
|
||||||
<<: *common
|
<<: *common
|
||||||
environment:
|
environment:
|
||||||
<<: *common-env
|
<<: *common-env
|
||||||
INVIDIOUS_INVIDIOUS_COMPANION: '[{"private_url": "https://inv-us1.nadeko.net:8448", "public_url": "https://inv-us1.nadeko.net:8448"}]'
|
INVIDIOUS_INVIDIOUS_COMPANION: '[{"private_url": "https://inv-eu2-c.nadeko.net", "public_url": "https://inv-eu2-c.nadeko.net"}]'
|
||||||
|
INVIDIOUS_EXTERNAL_VIDEOPLAYBACK_PROXY: '["https://inv-eu2.nadeko.net"]'
|
||||||
networks: ["invidious5"]
|
networks: ["invidious5"]
|
||||||
depends_on: ["valkey5", "haproxy5"]
|
depends_on: ["valkey5", "haproxy5"]
|
||||||
|
|
||||||
|
|
|
@ -32,3 +32,7 @@ services:
|
||||||
networks:
|
networks:
|
||||||
- invidious4
|
- invidious4
|
||||||
|
|
||||||
|
valkey5:
|
||||||
|
<<: *common
|
||||||
|
networks:
|
||||||
|
- invidious5
|
||||||
|
|
Loading…
Add table
Reference in a new issue