Sfoglia il codice sorgente

Merge pull request #2179 from rhansen/swarm

fix: Partially revert "chore: Remove support for legacy swarm"
Nicolas Duchon 2 anni fa
parent
commit
afd6544702
1 ha cambiato i file con 8 aggiunte e 0 eliminazioni
  1. 8 0
      nginx.tmpl

+ 8 - 0
nginx.tmpl

@@ -41,6 +41,14 @@
     {{- $ip := "" }}
     #     networks:
     {{- range sortObjectsByKeysAsc $.container.Networks "Name" }}
+        {{- /*
+             * TODO: Only ignore the "ingress" network for Swarm tasks (in case
+             * the user is not using Swarm mode and names a network "ingress").
+             */}}
+        {{- if eq .Name "ingress" }}
+    #         {{ .Name }} (ignored)
+            {{- continue }}
+        {{- end }}
         {{- if and (not (index $.globals.networks .Name)) (not $.globals.networks.host) }}
     #         {{ .Name }} (unreachable)
             {{- continue }}