Compare commits
2 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 9c24e79bba | |||
| 79c325329c |
@@ -15,8 +15,9 @@ services:
|
||||
restart: unless-stopped
|
||||
profiles:
|
||||
- cloudflare
|
||||
command: ["tunnel", "--no-autoupdate", "run", "--credentials-file", "/etc/cloudflared/credentials.json", "homeserver"]
|
||||
command: ["--config", "/etc/cloudflared/config.yml", "tunnel", "run"]
|
||||
volumes:
|
||||
- ./docker/cloudflared/config.yml:/etc/cloudflared/config.yml:ro
|
||||
- /etc/cloudflared/credentials.json:/etc/cloudflared/credentials.json:ro
|
||||
depends_on:
|
||||
nginx:
|
||||
|
||||
+2
-1
@@ -5,8 +5,9 @@ services:
|
||||
restart: unless-stopped
|
||||
profiles:
|
||||
- cloudflare
|
||||
command: ["tunnel", "--no-autoupdate", "run", "--credentials-file", "/etc/cloudflared/credentials.json", "homeserver"]
|
||||
command: ["--config", "/etc/cloudflared/config.yml", "tunnel", "run"]
|
||||
volumes:
|
||||
- ./docker/cloudflared/config.yml:/etc/cloudflared/config.yml:ro
|
||||
- /etc/cloudflared/credentials.json:/etc/cloudflared/credentials.json:ro
|
||||
depends_on:
|
||||
nginx:
|
||||
|
||||
@@ -0,0 +1,8 @@
|
||||
tunnel: homeserver
|
||||
credentials-file: /etc/cloudflared/credentials.json
|
||||
|
||||
ingress:
|
||||
- service: https://nginx:443
|
||||
originRequest:
|
||||
noTLSVerify: true
|
||||
- service: http_status:404
|
||||
@@ -653,7 +653,11 @@ compose_up_args+=(--env-file "$ENV_FILE")
|
||||
if [ -n "$COMPOSE_PROFILES_VALUE" ]; then
|
||||
export COMPOSE_PROFILES="$COMPOSE_PROFILES_VALUE"
|
||||
fi
|
||||
docker compose "${compose_up_args[@]}" up -d --remove-orphans
|
||||
if ! docker compose "${compose_up_args[@]}" up -d --remove-orphans; then
|
||||
echo "Docker Compose startup failed once. Waiting briefly and retrying..."
|
||||
sleep 5
|
||||
docker compose "${compose_up_args[@]}" up -d --remove-orphans
|
||||
fi
|
||||
|
||||
verify_stack_health
|
||||
|
||||
|
||||
Reference in New Issue
Block a user