diff --git a/invidious/valkey-invidious/docker-compose.yml b/invidious/valkey-invidious/docker-compose.yml index 6c6f1dd..e76ecc9 100644 --- a/invidious/valkey-invidious/docker-compose.yml +++ b/invidious/valkey-invidious/docker-compose.yml @@ -9,7 +9,6 @@ services: image: valkey/valkey:7.2-alpine restart: unless-stopped volumes: - # - invidious-valkey:/data - ./valkey.conf:/usr/local/etc/valkey/valkey.conf command: "valkey-server /usr/local/etc/valkey/valkey.conf" networks: @@ -19,7 +18,6 @@ services: image: valkey/valkey:7.2-alpine restart: unless-stopped volumes: - # - invidious-valkey-vpn:/data - ./valkey.conf:/usr/local/etc/valkey/valkey.conf command: "valkey-server /usr/local/etc/valkey/valkey.conf" networks: @@ -29,41 +27,68 @@ services: image: valkey/valkey:7.2-alpine restart: unless-stopped volumes: - # - invidious-valkey-vpn-2:/data - ./valkey.conf:/usr/local/etc/valkey/valkey.conf command: "valkey-server /usr/local/etc/valkey/valkey.conf" networks: - gluetun_network_2 - # INVIDIOUS VALKEY METRICS - invidious-redis-exporter: - image: oliver006/redis_exporter + valkey-external: + image: valkey/valkey:7.2-alpine restart: unless-stopped - ports: - - "127.0.0.1:9121:9121" - command: "--redis.addr=redis://valkey:6379" + volumes: + - ./valkey.conf:/usr/local/etc/valkey/valkey.conf + command: "valkey-server /usr/local/etc/valkey/valkey.conf" networks: - - invidious + - invidious-external - # INVIDIOUS VALKEY METRICS - invidious-redis-exporter-vpn: - image: oliver006/redis_exporter - restart: unless-stopped - ports: - - "127.0.0.1:9122:9121" - command: "--redis.addr=redis://valkey-vpn:6379" - networks: - - gluetun_network + # valkey-with-companion: + # image: valkey/valkey:7.2-alpine + # restart: unless-stopped + # volumes: + # - ./valkey.conf:/usr/local/etc/valkey/valkey.conf + # command: "valkey-server /usr/local/etc/valkey/valkey.conf" + # networks: + # - invidious-with-companion - # INVIDIOUS VALKEY METRICS - invidious-redis-exporter-vpn-2: - image: oliver006/redis_exporter - restart: unless-stopped - ports: - - "127.0.0.1:9123:9121" - command: "--redis.addr=redis://valkey-vpn-2:6379" - networks: - - gluetun_network_2 + # # INVIDIOUS VALKEY METRICS + # invidious-redis-exporter: + # image: oliver006/redis_exporter + # restart: unless-stopped + # ports: + # - "127.0.0.1:9121:9121" + # command: "--redis.addr=redis://valkey:6379" + # networks: + # - invidious + # + # # INVIDIOUS VALKEY METRICS + # invidious-redis-exporter-vpn: + # image: oliver006/redis_exporter + # restart: unless-stopped + # ports: + # - "127.0.0.1:9122:9121" + # command: "--redis.addr=redis://valkey-vpn:6379" + # networks: + # - gluetun_network + # + # # INVIDIOUS VALKEY METRICS + # invidious-redis-exporter-vpn-2: + # image: oliver006/redis_exporter + # restart: unless-stopped + # ports: + # - "127.0.0.1:9123:9121" + # command: "--redis.addr=redis://valkey-vpn-2:6379" + # networks: + # - gluetun_network_2 + # + # # INVIDIOUS VALKEY METRICS + # invidious-redis-exporter-external: + # image: oliver006/redis_exporter + # restart: unless-stopped + # ports: + # - "127.0.0.1:9124:9121" + # command: "--redis.addr=redis://valkey-external:6379" + # networks: + # - invidious-external networks: invidious: @@ -71,10 +96,16 @@ networks: gluetun_network: external: true gluetun_network_2: + external: true + invidious-external: + external: true + invidious-with-companion: external: true -volumes: - invidious-valkey: - invidious-valkey-vpn: - invidious-valkey-vpn-2: + # volumes: + # invidious-valkey: + # invidious-valkey-vpn: + # invidious-valkey-vpn-2: + # invidious-external: + # invidious-with-companion: diff --git a/invidious/valkey-invidious/valkey.conf b/invidious/valkey-invidious/valkey.conf index cc621c8..fe20066 100644 --- a/invidious/valkey-invidious/valkey.conf +++ b/invidious/valkey-invidious/valkey.conf @@ -1,5 +1,5 @@ -maxmemory 1024mb -maxmemory-policy volatile-ttl +maxmemory 796mb +maxmemory-policy volatile-lfu # Disable AOF appendonly no