update to only companion

docker-compose-nginx.yml

@@ -1,28 +1,26 @@
 x-common-elements: &common-elements
   restart: always
   env_file:
-    - path: ./_common.env
+    - path: ./.common.env
     - path: ./.env
 
 services:
-  # HAProxy
+  # NGINX
   webserver:
-    # https://github.com/iuridiniz/haproxy-quic-docker
-    # Image to support QUIC
-    image: iuridiniz/haproxy:${HAPROXY_TAG}
+    image: git.nadeko.net/fijxu/nginx-ktls:${NGINX_TAG}
     <<: *common-elements
     networks:
       proxy-server:
         ipv4_address: 172.50.0.2
     volumes:
-      - ./haproxy.cfg:/etc/haproxy/haproxy.cfg
-      - ./denylist.txt:/etc/haproxy/denylist.txt
+      - ./nginx.conf:/nginx.conf.template
       - ./key.key:/certs/cert.pem.key
       - ./fullchain.pem:/certs/cert.pem
       - videoplayback_proxy:/tmp
     ports:
       - "${REVERSEPROXY_PUBLIC_PORT}:443/tcp"
-      - "${REVERSEPROXY_METRICS_PORT}:10000/tcp"
+    labels:
+      - "com.centurylinklabs.watchtower.enable=true"
 
   http3-ytproxy:
     <<: *common-elements

docker-compose.yml

@@ -1,32 +1,28 @@
 x-common-elements: &common-elements
   restart: always
   env_file:
-    - path: ./_common.env
+    - path: ./.common.env
     - path: ./.env
 
 services:
-  # NGINX
+  # HAProxy
   webserver:
-    image: git.nadeko.net/fijxu/nginx-ktls:${NGINX_TAG}
+    # https://github.com/iuridiniz/haproxy-quic-docker
+    # Image to support QUIC (altrough I don't use QUIC anymore becuase it's
+    # useless for video streaming, for a reason Netflix doesn't even use it)
+    image: iuridiniz/haproxy:${HAPROXY_TAG}
     <<: *common-elements
     networks:
       proxy-server:
         ipv4_address: 172.50.0.2
     volumes:
-      - ./nginx.conf:/nginx.conf.template
+      - ./haproxy.cfg:/etc/haproxy/haproxy.cfg
+      - ./denylist.txt:/etc/haproxy/denylist.txt
       - ./key.key:/certs/cert.pem.key
       - ./fullchain.pem:/certs/cert.pem
-      - videoplayback_proxy:/tmp
     ports:
       - "${REVERSEPROXY_PUBLIC_PORT}:443/tcp"
-    labels:
-      - "com.centurylinklabs.watchtower.enable=true"
-
-  http3-ytproxy:
-    <<: *common-elements
-    extends:
-      file: ./proxy-components.yml
-      service: http3-ytproxy
+      - "${REVERSEPROXY_METRICS_PORT}:10000/tcp"
 
   companion:
     <<: *common-elements
@@ -46,9 +42,6 @@ services:
       file: ./proxy-components.yml
       service: watchtower
 
-volumes:
-  videoplayback_proxy:
-
 networks:
   proxy-server:
     driver: bridge

haproxy.cfg

@@ -60,14 +60,11 @@ frontend www
 	acl health_check path /health
 	http-request return status 200 if health_check
 
-	acl videoplayback path_beg /videoplayback
-
 	use_backend http3-ytproxy if h || hh
 	use_backend companion if c || cc
 
 backend http3-ytproxy
-	#server s1 gluetun:8080 resolvers docker init-addr libc,none
 	server s1 unix@/tmp/http-ytproxy.sock
 
 backend companion
-	server s1 172.50.0.3:8081 check resolvers docker init-addr libc,none
+	server s1 gluetun:8081 check resolvers docker init-addr libc,none

proxy-components.yml

@@ -1,29 +1,15 @@
 services:
-  http3-ytproxy:
-    image: git.nadeko.net/fijxu/http3-ytproxy:${YTPROXY_TAG}
-    network_mode: "service:gluetun"
-    volumes:
-      - videoplayback_proxy:/tmp
-    depends_on:
-      gluetun:
-        condition: service_healthy
-      webserver:
-        condition: service_started
-    labels:
-      - "com.centurylinklabs.watchtower.enable=true"
-
   companion:
     image: git.nadeko.net/fijxu/invidious-companion:${COMPANION_TAG}
     user: 2000:2000
-    networks:
-      proxy-server:
-        ipv4_address: 172.50.0.3
+    network_mode: "service:gluetun"
     volumes:
       - ./cache:/var/tmp/youtubei.js:rw
-      - ./proxies.txt:/app/proxies.txt
     depends_on:
       webserver:
         condition: service_started
+      gluetun:
+        condition: service_healthy
     labels:
       - "com.centurylinklabs.watchtower.enable=true"
 
@@ -47,4 +33,4 @@ services:
       - /var/run/docker.sock:/var/run/docker.sock
     environment:
       - WATCHTOWER_LABEL_ENABLE=true
-      - WATCHTOWER_POLL_INTERVAL=60
+      - WATCHTOWER_POLL_INTERVAL=30