Bläddra i källkod

contrib/sni-router: switch env alias to merge key

Lets downstreams add per-service env vars (e.g. HOST for Caddy's
Dynu DNS-01 challenge) without breaking the shared DOMAIN alias.
pull/502/head
Alexey Dolotov 4 dagar sedan
förälder
incheckning
b293a33d99
1 ändrade filer med 4 tillägg och 2 borttagningar
  1. 4
    2
      contrib/sni-router/docker-compose.yml

+ 4
- 2
contrib/sni-router/docker-compose.yml Visa fil

@@ -29,7 +29,8 @@ services:
29 29
       - "80:80"
30 30
     volumes:
31 31
       - ./haproxy.cfg:/usr/local/etc/haproxy/haproxy.cfg:ro,Z
32
-    environment: *domain-env
32
+    environment:
33
+      <<: *domain-env
33 34
     depends_on:
34 35
       - mtg
35 36
       - web
@@ -56,7 +57,8 @@ services:
56 57
     expose:
57 58
       - "80"
58 59
       - "8443"
59
-    environment: *domain-env
60
+    environment:
61
+      <<: *domain-env
60 62
     restart: unless-stopped
61 63
 
62 64
 volumes:

Laddar…
Avbryt
Spara