diff --git a/caddy-labeled/Dockerfile b/caddy-labeled/Dockerfile index 6adad5d..8f9806d 100644 --- a/caddy-labeled/Dockerfile +++ b/caddy-labeled/Dockerfile @@ -1,7 +1,8 @@ FROM caddy:2-builder AS builder RUN xcaddy build \ --with github.com/lucaslorentz/caddy-docker-proxy/v2 \ + --with github.com/greenpau/caddy-security@v1.1.31 \ --with github.com/caddy-dns/cloudflare FROM caddy:2 -COPY --from=builder /usr/bin/caddy /usr/bin/caddy +COPY --from=builder /usr/bin/caddy /usr/bin/caddy \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index 524d6e0..63e0cb4 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -19,13 +19,20 @@ services: # Глобальные настройки + сниппет для forward_auth (Tinyauth) labels: caddy.email: dead@cxap.space - caddy.acme_dns: "cloudflare {env.CF_API_TOKEN}" + caddy.dns: "cloudflare {env.CF_API_TOKEN}" + command: ["caddy","docker-proxy","--docker-sockets","unix:///var/run/docker.sock"] + + caddy-snippets: + image: alpine:3.20 + command: ["sleep", "infinity"] + restart: unless-stopped + networks: [proxy] + labels: # сниппет аутентификации caddy: (tinyauth_forwarder) caddy.forward_auth: tinyauth:3000 caddy.forward_auth.uri: /api/auth/caddy caddy.forward_auth.copy_headers: Remote-User Remote-Name Remote-Email Remote-Groups - command: ["caddy","docker-proxy","--docker-sockets","unix:///var/run/docker.sock"] tinyauth: image: ghcr.io/steveiliop56/tinyauth:v3