Merge pull request #6036 from l3x4/fix-traefik-vhosts-templates-compose
Fix traefik vhosts compose template
This commit is contained in:
@@ -25,7 +25,12 @@ services:
|
|||||||
- --certificatesresolvers.leresolver.acme.tlschallenge=true
|
- --certificatesresolvers.leresolver.acme.tlschallenge=true
|
||||||
{{ end }}
|
{{ end }}
|
||||||
|
|
||||||
|
{{ if or (eq $.TRAEFIK_API_ENABLED "true") ($.TRAEFIK_BASIC_AUTH) ($.TRAEFIK_LETSENCRYPT_EMAIL) }}
|
||||||
labels:
|
labels:
|
||||||
|
{{ else }}
|
||||||
|
labels: []
|
||||||
|
{{ end }}
|
||||||
|
|
||||||
{{ if eq $.TRAEFIK_API_ENABLED "true" }}
|
{{ if eq $.TRAEFIK_API_ENABLED "true" }}
|
||||||
# Dashboard
|
# Dashboard
|
||||||
- "traefik.http.routers.api.rule=Host(`{{ $.TRAEFIK_API_VHOST }}`)"
|
- "traefik.http.routers.api.rule=Host(`{{ $.TRAEFIK_API_VHOST }}`)"
|
||||||
@@ -33,8 +38,8 @@ services:
|
|||||||
- "traefik.http.routers.api.entrypoints={{ if $.TRAEFIK_LETSENCRYPT_EMAIL }}https{{ else }}http{{ end }}"
|
- "traefik.http.routers.api.entrypoints={{ if $.TRAEFIK_LETSENCRYPT_EMAIL }}https{{ else }}http{{ end }}"
|
||||||
{{ end }}
|
{{ end }}
|
||||||
|
|
||||||
- "traefik.http.routers.api.middlewares=auth"
|
|
||||||
{{ if $.TRAEFIK_BASIC_AUTH }}
|
{{ if $.TRAEFIK_BASIC_AUTH }}
|
||||||
|
- "traefik.http.routers.api.middlewares=auth"
|
||||||
- "traefik.http.middlewares.auth.basicauth.users={{ $.TRAEFIK_BASIC_AUTH }}"
|
- "traefik.http.middlewares.auth.basicauth.users={{ $.TRAEFIK_BASIC_AUTH }}"
|
||||||
{{ end }}
|
{{ end }}
|
||||||
|
|
||||||
|
|||||||
@@ -238,3 +238,25 @@ teardown() {
|
|||||||
echo "status: $status"
|
echo "status: $status"
|
||||||
assert_output "http:80:5000"
|
assert_output "http:80:5000"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@test "(traefik) show-config without auth set" {
|
||||||
|
run /bin/bash -c "dokku traefik:set --global basic-auth-username \"\""
|
||||||
|
run /bin/bash -c "dokku traefik:set --global basic-auth-password \"\""
|
||||||
|
|
||||||
|
run /bin/bash -c "dokku traefik:show-config"
|
||||||
|
echo "output: $output"
|
||||||
|
echo "status: $status"
|
||||||
|
assert_success
|
||||||
|
refute_line ' - "traefik.http.routers.api.middlewares=auth"'
|
||||||
|
}
|
||||||
|
|
||||||
|
@test "(traefik) show-config with auth set" {
|
||||||
|
run /bin/bash -c "dokku traefik:set --global basic-auth-username test-username"
|
||||||
|
run /bin/bash -c "dokku traefik:set --global basic-auth-password test-password"
|
||||||
|
|
||||||
|
run /bin/bash -c "dokku traefik:show-config"
|
||||||
|
echo "output: $output"
|
||||||
|
echo "status: $status"
|
||||||
|
assert_success
|
||||||
|
assert_line ' - "traefik.http.routers.api.middlewares=auth"'
|
||||||
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user