diff --git a/docker/dev/tls/docker-compose.override.example.yml b/docker/dev/tls/docker-compose.override.example.yml index f2f6b439f5f..20bb3767022 100644 --- a/docker/dev/tls/docker-compose.override.example.yml +++ b/docker/dev/tls/docker-compose.override.example.yml @@ -1,13 +1,11 @@ services: traefik: - # Overwrite to enable Let's encrypt instead of using Step CA for certificate generation - # command: > - # --entryPoints.websecure.http.tls.certresolver=letsencrypt - # --certificatesresolvers.letsencrypt.acme.email=you@example.com - - # For step CA only: Overwrite trusted CA certificates with Step root CA (not needed for Let's encrypt) environment: - - LEGO_CA_CERTIFICATES=/step/certs/root_ca.crt + # For step CA only: Overwrite trusted CA certificates with Step root CA (not needed for Let's encrypt) + LEGO_CA_CERTIFICATES: /step/certs/root_ca.crt + # Overwrite to enable Let's encrypt instead of using Step CA for certificate generation + # TRAEFIK_ENTRYPOINTS_WEBSECURE_HTTP_TLS_CERTRESOLVER: letsencrypt + # TRAEFIK_CERTIFICATESRESOLVERS_LETSENCRYPT_ACME_EMAIL: you@example.com # Necessary for certificates via Step CA only depends_on: diff --git a/docker/dev/tls/docker-compose.yml b/docker/dev/tls/docker-compose.yml index a75a3773a94..05bc676893c 100644 --- a/docker/dev/tls/docker-compose.yml +++ b/docker/dev/tls/docker-compose.yml @@ -5,11 +5,23 @@ services: - "80:80" - "443:443" volumes: - - ./traefik.yaml:/etc/traefik/traefik.yaml:ro - /var/run/docker.sock:/var/run/docker.sock - ./acme.json:/acme.json - step:/step:ro restart: unless-stopped + environment: + TRAEFIK_LOG_LEVEL: INFO + TRAEFIK_API_DISABLEDASHBOARDAD: true + TRAEFIK_PROVIDERS_DOCKER_NETWORK: gateway + TRAEFIK_PROVIDERS_DOCKER_EXPOSEDBYDEFAULT: false + TRAEFIK_ENTRYPOINTS_WEB_ADDRESS: ":80" + TRAEFIK_ENTRYPOINTS_WEB_HTTP_REDIRECTIONS_ENTRYPOINT_TO: websecure + TRAEFIK_ENTRYPOINTS_WEBSECURE_ADDRESS: ":443" + TRAEFIK_ENTRYPOINTS_WEBSECURE_HTTP_TLS_CERTRESOLVER: step + TRAEFIK_CERTIFICATESRESOLVERS_STEP_ACME_CASERVER: https://step:9000/acme/acme/directory + TRAEFIK_CERTIFICATESRESOLVERS_STEP_ACME_TLSCHALLENGE: true + TRAEFIK_CERTIFICATESRESOLVERS_STEP_ACME_EMAIL: root@localhost + TRAEFIK_CERTIFICATESRESOLVERS_LETSENCRYPT_ACME_HTTPCHALLENGE_ENTRYPOINT: web networks: external: aliases: diff --git a/docker/dev/tls/traefik.yaml b/docker/dev/tls/traefik.yaml deleted file mode 100644 index 7f19e16d581..00000000000 --- a/docker/dev/tls/traefik.yaml +++ /dev/null @@ -1,39 +0,0 @@ -log: - level: INFO - -api: - dashboard: true - disabledashboardad: true - -providers: - docker: - network: gateway - exposedByDefault: false - -entryPoints: - web: - address: ":80" - http: - redirections: - entrypoint: - to: websecure - websecure: - address: ":443" - http: - tls: - certresolver: step # Using step by default, overwritable via CLI - -certificatesresolvers: - step: - acme: - caserver: https://step:9000/acme/acme/directory - tlschallenge: true - email: root@localhost - keytype: RSA4096 - storage: acme.json - letsencrypt: - acme: - keytype: RSA4096 - storage: acme.json - httpChallenge: - entryPoint: web