github/dokku
0
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

fix: set multiple hosts via logical operators to conform to new v3 syntax

Browse Source
This commit is contained in:
Jose Diaz-Gonzalez
2024-09-22 01:37:39 -04:00
parent c0c66e7d88
commit 02cfe5d653
1 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
plugins/traefik-vhosts/docker-args-process-deploy
View File

@@ -83,8 +83,18 @@ trigger-traefik-vhosts-docker-args-process-deploy() {
if [[ -n "$is_app_listening" ]]; then if [[ -n "$is_app_listening" ]]; then
app_domains="$(plugn trigger domains-list "$APP")" app_domains="$(plugn trigger domains-list "$APP")"
if [[ -n "$app_domains" ]]; then if [[ -n "$app_domains" ]]; then
traefik_domains="$(echo "$app_domains" | xargs)" # get length of domains
traefik_domains="${traefik_domains// /\\\`,\\\`}" if [[ "$(echo "$traefik_domains" | wc -w)" -eq 1 ]]; then
traefik_domains="Host(\\\`$traefik_domains\\\`)"
else
for domain in $(echo "$app_domains" | xargs); do
if [[ -z "$traefik_domains" ]]; then
traefik_domains="Host(\\\`$domain\\\`)"
continue
fi
traefik_domains="$traefik_domains || Host(\\\`$domain\\\`)"
done
fi
fi fi
output="--label traefik.enable=true" output="--label traefik.enable=true"
@@ -99,7 +109,7 @@ trigger-traefik-vhosts-docker-args-process-deploy() {
output="$output --label traefik.http.routers.$APP-$PROC_TYPE-http.entrypoints=$(fn-traefik-http-entry-point)" output="$output --label traefik.http.routers.$APP-$PROC_TYPE-http.entrypoints=$(fn-traefik-http-entry-point)"
output="$output --label traefik.http.routers.$APP-$PROC_TYPE-http.service=$APP-$PROC_TYPE-http" output="$output --label traefik.http.routers.$APP-$PROC_TYPE-http.service=$APP-$PROC_TYPE-http"
if [[ -n "$traefik_domains" ]]; then if [[ -n "$traefik_domains" ]]; then
output="$output --label \"traefik.http.routers.$APP-$PROC_TYPE-http.rule=Host(\\\`$traefik_domains\\\`)\"" output="$output --label \"traefik.http.routers.$APP-$PROC_TYPE-http.rule=$traefik_domains\""
fi fi
fi fi