Compare commits

...

1 Commits

Author SHA1 Message Date
Jonathan Dahan d107193958 Try using the proxy, failure logging into webdav
2 years ago

@ -2,19 +2,31 @@ version: "3.7"
services: services:
caddy: caddy:
image: caddy image: lucaslorentz/caddy-docker-proxy:ci-alpine
restart: unless-stopped restart: unless-stopped
ports: ports:
- "80:80" - "80:80"
- "443:443" - "443:443"
- "443:443/udp" - "443:443/udp"
privileged: true
volumes: volumes:
- /var/run/docker.sock:/var/run/docker.sock:ro
- ./caddy/Caddyfile:/etc/caddy/Caddyfile - ./caddy/Caddyfile:/etc/caddy/Caddyfile
- ../data/caddy/site:/site - ../data/caddy/site:/site
- ../data/caddy/data:/data - ../data/caddy/data:/data
- caddy_config:/config - caddy_config:/config
environment: environment:
- DOMAIN - DOMAIN
- CADDY_INGRESS_NETWORKS=caddy
labels:
caddy: ${DOMAIN}
caddy.file_server.root: /site
networks:
- caddy
networks:
caddy:
external: true
volumes: volumes:
caddy_config: caddy_config:

@ -4,6 +4,3 @@
} }
} }
web.{$DOMAIN} {
reverse_proxy services-web-1:4431
}

@ -2,21 +2,37 @@ version: "3.7"
services: services:
web: web:
depends_on:
- caddy
build: build:
context: ./web context: ./web
dockerfile: Containerfile dockerfile: Containerfile
restart: unless-stopped restart: unless-stopped
privileged: true
ports: ports:
- "8081:80" - "8081:80"
- "4431:443" - "4431:443"
- "4431:443/udp" - "4431:443/udp"
volumes: volumes:
- /var/run/docker.sock:/var/run/docker.sock:ro
- ./web/Caddyfile:/etc/caddy/Caddyfile - ./web/Caddyfile:/etc/caddy/Caddyfile
- ../data/web/site:/site - ../data/web/site:/site
- ../data/web/data:/data - ../data/web/data:/data
- caddy_config:/config - caddy_config:/config
environment: environment:
- DOMAIN - DOMAIN
networks:
- caddy
labels:
caddy: web.${DOMAIN}
# caddy.reverse_proxy: "{{upstreams 4431}}"
caddy.reverse_proxy: services-web-1:4431
#security_opt:
# - label=disable
networks:
caddy:
external: true
volumes: volumes:
caddy_config: caddy_config:

@ -4,7 +4,8 @@ services:
zitadel: zitadel:
restart: 'always' restart: 'always'
networks: networks:
- 'zitadel' - zitadel
- caddy
image: 'ghcr.io/zitadel/zitadel:latest' image: 'ghcr.io/zitadel/zitadel:latest'
command: 'start-from-init --masterkey "6cd52ccbc4da912319f0fdc016d68575dd391bd932ebdc045c89b2dce9e90315" --tlsMode disabled' command: 'start-from-init --masterkey "6cd52ccbc4da912319f0fdc016d68575dd391bd932ebdc045c89b2dce9e90315" --tlsMode disabled'
environment: environment:
@ -15,11 +16,15 @@ services:
condition: 'service_healthy' condition: 'service_healthy'
ports: ports:
- '8123:8080' - '8123:8080'
labels:
- caddy: login.${DOMAIN}
- caddy.reverse_proxy: "{{upstreams}}"
crdb: crdb:
restart: 'always' restart: 'always'
networks: networks:
- 'zitadel' - zitadel
- caddy
image: 'cockroachdb/cockroach:v22.2.2' image: 'cockroachdb/cockroach:v22.2.2'
command: 'start-single-node --insecure' command: 'start-single-node --insecure'
healthcheck: healthcheck:
@ -33,4 +38,7 @@ services:
- '26257:26257' - '26257:26257'
networks: networks:
caddy:
external: true
zitadel: zitadel:

Loading…
Cancel
Save