diff --git a/dktk-fed/docker-compose.yml b/dktk-fed/docker-compose.yml index 04458de..ffeded3 100644 --- a/dktk-fed/docker-compose.yml +++ b/dktk-fed/docker-compose.yml @@ -5,22 +5,26 @@ services: container_name: bridgehead_traefik image: traefik:2.4 command: - - --api.insecure=true - --entrypoints.web.address=:80 - --entrypoints.websecure.address=:443 - --providers.docker=true - - --providers.file.watch=true + - --api.dashboard=true + - --accesslog=true # print access-logs - --entrypoints.web.http.redirections.entrypoint.to=websecure - --entrypoints.web.http.redirections.entrypoint.scheme=https + labels: + - "traefik.http.routers.dashboard.rule=PathPrefix(`/api`) || PathPrefix(`/dashboard`)" + - "traefik.http.routers.dashboard.entrypoints=websecure" + - "traefik.http.routers.dashboard.service=api@internal" + - "traefik.http.routers.dashboard.tls=true" + - "traefik.http.routers.dashboard.middlewares=auth" + - "traefik.http.middlewares.auth.basicauth.users=${bc_auth_users}" ports: - 80:80 - 443:443 - - 8080:8080 volumes: - ../certs:/tools/certs - - ../tools/traefik/:/configuration/ - /var/run/docker.sock:/var/run/docker.sock:ro - - ../auth/:/auth extra_hosts: - "host.docker.internal:host-gateway" diff --git a/lib/add_bc_user.sh b/lib/add_bc_user.sh index 6ff4c92..924f2e1 100755 --- a/lib/add_bc_user.sh +++ b/lib/add_bc_user.sh @@ -3,7 +3,7 @@ echo "This script add's a user with password to the bridghead" if [ $# -eq 0 ]; then - echo "No arguments provided, please provide the prject name" + echo "No arguments provided, please provide the project name" exit 1 fi diff --git a/lib/generate.sh b/lib/generate.sh index aed7704..8d64d14 100755 --- a/lib/generate.sh +++ b/lib/generate.sh @@ -1,6 +1,6 @@ #!/bin/bash -cat > ../landing/index.html < ./landing/index.html < @@ -70,11 +70,11 @@ cat > ../landing/index.html < Bridgehead - Reverse Proxy Traefik + Reverse Proxy Traefik DKTK - Blaze + Blaze