Use docker compose fragments instead of extend to prevent attribute duplication

invidious/invidious-vpn-2/docker-compose.yml

@@ -1,7 +1,7 @@
 # Docker compose file for Backend 3 of inv.nadeko.net
-#
+
-services:
+#https://docs.docker.com/reference/compose-file/fragments/
-  invidious-extend:
+x-common-config: &common-config
   env_file:
     # Env file containing variables like TAG, INV_MEM_*
     - .env
@@ -19,7 +19,7 @@ services:
   depends_on:
     # - inv_sig_helper
     - haproxy
-    environment:
+  environment: &env
     INVIDIOUS_CONFIG_FILE: "/etc/invidious/config.yml"
   healthcheck:
     test: wget -nv --tries=1 --spider https://inv.nadeko.net/watch?v=mcYLzu_1cNc || exit 1
@@ -27,28 +27,30 @@ services:
     timeout: 5s
     retries: 2
 
+services:
   # INVIDIOUS CLEARNET
   invidious:
-    extends:
+    <<: *common-config
-      service: invidious-extend
     environment:
+      <<: *env
       INVIDIOUS_PORT: "3000"
 
   invidious2:
-    extends:
+    <<: *common-config
-      service: invidious-extend
     environment:
+      <<: *env
       INVIDIOUS_PORT: "3001"
 
   invidious3:
-    extends:
+    <<: *common-config
-      service: invidious-extend
     environment:
+      <<: *env
       INVIDIOUS_PORT: "3002"
 
   invidious4:
-    extends:
+    <<: *common-config
-      service: invidious-extend
+    environment:
+      <<: *env
       INVIDIOUS_PORT: "3003"
 
   # SIGNATURE HELPER

invidious/invidious-vpn/docker-compose.yml

@@ -1,7 +1,7 @@
 # Docker compose file for Backend 2 of inv.nadeko.net
 
-services:
+#https://docs.docker.com/reference/compose-file/fragments/
-  invidious-extend:
+x-common-config: &common-config
   env_file:
     # Env file containing variables like TAG, INV_MEM_*
     - .env
@@ -19,7 +19,7 @@ services:
   depends_on:
     # - inv_sig_helper
     - haproxy
-    environment:
+  environment: &env
     INVIDIOUS_CONFIG_FILE: "/etc/invidious/config.yml"
   healthcheck:
     test: wget -nv --tries=1 --spider https://inv.nadeko.net/watch?v=mcYLzu_1cNc || exit 1
@@ -27,28 +27,30 @@ services:
     timeout: 5s
     retries: 2
 
+services:
   # INVIDIOUS CLEARNET
   invidious:
-    extends:
+    <<: *common-config
-      service: invidious-extend
     environment:
+      <<: *env
       INVIDIOUS_PORT: "3000"
 
   invidious2:
-    extends:
+    <<: *common-config
-      service: invidious-extend
     environment:
+      <<: *env
       INVIDIOUS_PORT: "3001"
 
   invidious3:
-    extends:
+    <<: *common-config
-      service: invidious-extend
     environment:
+      <<: *env
       INVIDIOUS_PORT: "3002"
 
   invidious4:
-    extends:
+    <<: *common-config
-      service: invidious-extend
+    environment:
+      <<: *env
       INVIDIOUS_PORT: "3003"
 
   # SIGNATURE HELPER
@@ -130,3 +132,4 @@ networks:
   gluetun_network:
     external: true
 
+