浏览代码

fix: do not discard containers without VIRTUAL_PATH

For containers grouped by identical VIRTUAL_HOST,
those with no VIRTUAL_PATH variable were silently discarded
when at least one container with VIRTUAL_PATH existed.
Nicolas Duchon 1 年之前
父节点
当前提交
be7c4c8c85
共有 1 个文件被更改,包括 1 次插入4 次删除
  1. 1 4
      nginx.tmpl

+ 1 - 4
nginx.tmpl

@@ -526,10 +526,7 @@ proxy_set_header Proxy "";
     {{- $vhost_data := when (hasKey $globals.vhosts $hostname) (get $globals.vhosts $hostname) (dict) }}
     {{- $paths := coalesce $vhost_data.paths (dict) }}
 
-    {{- $tmp_paths := groupBy $containers "Env.VIRTUAL_PATH" }}
-    {{- if not (gt (len $tmp_paths) 0) }}
-        {{- $tmp_paths = dict "/" $containers }}
-    {{- end }}
+    {{- $tmp_paths := groupByWithDefault $containers "Env.VIRTUAL_PATH" "/" }}
 
     {{- range $path, $containers := $tmp_paths }}
         {{- $dest := or (first (groupByKeys $containers "Env.VIRTUAL_DEST")) "" }}