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

Merge pull request #5499 from dokku/traefik-priority-v2

Browse Source 
Do not use traefik priority in service name
This commit is contained in:
josegonzalez
2022-11-29 00:20:13 -05:00
committed by GitHub
parent a416b07b0f 2807d71ac6
commit 2f79e68542
1 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -95,12 +95,12 @@ trigger-traefik-vhosts-docker-args-process-deploy() {
proxy_container_http_port="$proxy_container_http_port_candidate"
fi
output="$output --label traefik.http.services.$APP-$PROC_TYPE-http-$priority.loadbalancer.server.port=$proxy_container_http_port"
output="$output --label traefik.http.routers.$APP-$PROC_TYPE-http-$priority.entrypoints=http"
output="$output --label traefik.http.routers.$APP-$PROC_TYPE-http-$priority.priority=$priority"
output="$output --label traefik.http.routers.$APP-$PROC_TYPE-http-$priority.service=$APP-$PROC_TYPE"
output="$output --label traefik.http.services.$APP-$PROC_TYPE-http.loadbalancer.server.port=$proxy_container_http_port"
output="$output --label traefik.http.routers.$APP-$PROC_TYPE-http.entrypoints=http"
output="$output --label traefik.http.routers.$APP-$PROC_TYPE-http.priority=$priority"
output="$output --label traefik.http.routers.$APP-$PROC_TYPE-http.service=$APP-$PROC_TYPE-http"
if [[ -n "$traefik_domains" ]]; then
output="$output --label \"traefik.http.routers.$APP-$PROC_TYPE-http-$priority.rule=Host(\\\`$traefik_domains\\\`)\""
output="$output --label \"traefik.http.routers.$APP-$PROC_TYPE-http.rule=Host(\\\`$traefik_domains\\\`)\""
echo "# THIS FILE IS GENERATED BY DOKKU - DO NOT EDIT, YOUR CHANGES WILL BE OVERWRITTEN" >"$app_urls_path"
xargs -I{} echo "http://{}" <<<"$(echo "${app_domains}" | tr ' ' '\n' | sort -u)" >>"$app_urls_path"
fi
@@ -113,13 +113,13 @@ trigger-traefik-vhosts-docker-args-process-deploy() {
proxy_container_https_port="$proxy_container_https_port_candidate"
fi
output="$output --label traefik.http.services.$APP-$PROC_TYPE-https-$priority.loadbalancer.server.port=$proxy_container_https_port"
output="$output --label traefik.http.routers.$APP-$PROC_TYPE-https-$priority.entrypoints=https"
output="$output --label traefik.http.routers.$APP-$PROC_TYPE-https-$priority.priority=$priority"
output="$output --label traefik.http.routers.$APP-$PROC_TYPE-https-$priority.service=$APP-$PROC_TYPE-https"
output="$output --label traefik.http.routers.$APP-$PROC_TYPE-https-$priority.tls.certresolver=leresolver"
output="$output --label traefik.http.services.$APP-$PROC_TYPE-https.loadbalancer.server.port=$proxy_container_https_port"
output="$output --label traefik.http.routers.$APP-$PROC_TYPE-https.entrypoints=https"
output="$output --label traefik.http.routers.$APP-$PROC_TYPE-https.priority=$priority"
output="$output --label traefik.http.routers.$APP-$PROC_TYPE-https.service=$APP-$PROC_TYPE-https"
output="$output --label traefik.http.routers.$APP-$PROC_TYPE-https.tls.certresolver=leresolver"
if [[ -n "$traefik_domains" ]]; then
output="$output --label \"traefik.http.routers.$APP-$PROC_TYPE-https-$priority.rule=Host(\\\`$traefik_domains\\\`)\""
output="$output --label \"traefik.http.routers.$APP-$PROC_TYPE-https.rule=Host(\\\`$traefik_domains\\\`)\""
echo "# THIS FILE IS GENERATED BY DOKKU - DO NOT EDIT, YOUR CHANGES WILL BE OVERWRITTEN" >"$app_urls_path"
xargs -I{} echo "https://{}" <<<"$(echo "${app_domains}" | tr ' ' '\n' | sort -u)" >>"$app_urls_path"
fi