Remove network and reorder caddy
This commit is contained in:
@@ -1,7 +1,8 @@
|
|||||||
services:
|
services:
|
||||||
crowdsec:
|
crowdsec:
|
||||||
image: ghcr.io/crowdsecurity/crowdsec:v1.6.10
|
|
||||||
container_name: crowdsec
|
container_name: crowdsec
|
||||||
|
image: ghcr.io/crowdsecurity/crowdsec:v1.6.10
|
||||||
|
restart: unless-stopped
|
||||||
environment:
|
environment:
|
||||||
- BOUNCER_KEY_CADDY=${CROWDSEC_API_KEY}
|
- BOUNCER_KEY_CADDY=${CROWDSEC_API_KEY}
|
||||||
- GID=${GID}
|
- GID=${GID}
|
||||||
@@ -11,9 +12,6 @@ services:
|
|||||||
- ${APPDATA_PATH}/caddy/crowdsec-db:/var/lib/crowdsec/data/
|
- ${APPDATA_PATH}/caddy/crowdsec-db:/var/lib/crowdsec/data/
|
||||||
- ${APPDATA_PATH}/caddy/crowdsec-config:/etc/crowdsec/
|
- ${APPDATA_PATH}/caddy/crowdsec-config:/etc/crowdsec/
|
||||||
- ${APPDATA_PATH}/caddy/caddy-logs:/var/log/caddy:ro
|
- ${APPDATA_PATH}/caddy/caddy-logs:/var/log/caddy:ro
|
||||||
networks:
|
|
||||||
- frontend
|
|
||||||
restart: unless-stopped
|
|
||||||
healthcheck:
|
healthcheck:
|
||||||
test: ["CMD-SHELL", "wget --spider --quiet --tries=1 --timeout=5 http://localhost:8080/health > /dev/null 2>&1 || exit 1"]
|
test: ["CMD-SHELL", "wget --spider --quiet --tries=1 --timeout=5 http://localhost:8080/health > /dev/null 2>&1 || exit 1"]
|
||||||
interval: 30s
|
interval: 30s
|
||||||
@@ -22,8 +20,9 @@ services:
|
|||||||
start_period: 30s
|
start_period: 30s
|
||||||
|
|
||||||
caddy:
|
caddy:
|
||||||
image: docker.io/ryuupendragon/caddy-cloudflare-ddns-crowdsec:2.10.0
|
|
||||||
container_name: caddy
|
container_name: caddy
|
||||||
|
image: docker.io/ryuupendragon/caddy-cloudflare-ddns-crowdsec:2.10.0
|
||||||
|
restart: unless-stopped
|
||||||
depends_on:
|
depends_on:
|
||||||
crowdsec:
|
crowdsec:
|
||||||
condition: service_healthy
|
condition: service_healthy
|
||||||
@@ -42,10 +41,3 @@ services:
|
|||||||
- ${HTTP_PORT}:80
|
- ${HTTP_PORT}:80
|
||||||
- ${HTTPS_PORT}:443
|
- ${HTTPS_PORT}:443
|
||||||
- ${HTTPS_PORT}:443/udp
|
- ${HTTPS_PORT}:443/udp
|
||||||
networks:
|
|
||||||
- frontend
|
|
||||||
restart: unless-stopped
|
|
||||||
|
|
||||||
networks:
|
|
||||||
frontend:
|
|
||||||
external: true
|
|
||||||
|
@@ -1,7 +1,8 @@
|
|||||||
services:
|
services:
|
||||||
crowdsec:
|
crowdsec:
|
||||||
image: ghcr.io/crowdsecurity/crowdsec:v1.6.10
|
|
||||||
container_name: crowdsec
|
container_name: crowdsec
|
||||||
|
image: ghcr.io/crowdsecurity/crowdsec:v1.6.10
|
||||||
|
restart: unless-stopped
|
||||||
environment:
|
environment:
|
||||||
- BOUNCER_KEY_CADDY=${CROWDSEC_API_KEY}
|
- BOUNCER_KEY_CADDY=${CROWDSEC_API_KEY}
|
||||||
- GID=${GID}
|
- GID=${GID}
|
||||||
@@ -11,9 +12,6 @@ services:
|
|||||||
- ${APPDATA_PATH}/caddy/crowdsec-db:/var/lib/crowdsec/data/
|
- ${APPDATA_PATH}/caddy/crowdsec-db:/var/lib/crowdsec/data/
|
||||||
- ${APPDATA_PATH}/caddy/crowdsec-config:/etc/crowdsec/
|
- ${APPDATA_PATH}/caddy/crowdsec-config:/etc/crowdsec/
|
||||||
- ${APPDATA_PATH}/caddy/caddy-logs:/var/log/caddy:ro
|
- ${APPDATA_PATH}/caddy/caddy-logs:/var/log/caddy:ro
|
||||||
networks:
|
|
||||||
- frontend
|
|
||||||
restart: unless-stopped
|
|
||||||
healthcheck:
|
healthcheck:
|
||||||
test: ["CMD-SHELL", "wget --spider --quiet --tries=1 --timeout=5 http://localhost:8080/health > /dev/null 2>&1 || exit 1"]
|
test: ["CMD-SHELL", "wget --spider --quiet --tries=1 --timeout=5 http://localhost:8080/health > /dev/null 2>&1 || exit 1"]
|
||||||
interval: 30s
|
interval: 30s
|
||||||
@@ -22,8 +20,9 @@ services:
|
|||||||
start_period: 30s
|
start_period: 30s
|
||||||
|
|
||||||
caddy:
|
caddy:
|
||||||
image: docker.io/ryuupendragon/caddy-crowdsec:2.10.0
|
|
||||||
container_name: caddy
|
container_name: caddy
|
||||||
|
image: docker.io/ryuupendragon/caddy-crowdsec:2.10.0
|
||||||
|
restart: unless-stopped
|
||||||
depends_on:
|
depends_on:
|
||||||
crowdsec:
|
crowdsec:
|
||||||
condition: service_healthy
|
condition: service_healthy
|
||||||
@@ -41,10 +40,3 @@ services:
|
|||||||
- ${HTTP_PORT}:80
|
- ${HTTP_PORT}:80
|
||||||
- ${HTTPS_PORT}:443
|
- ${HTTPS_PORT}:443
|
||||||
- ${HTTPS_PORT}:443/udp
|
- ${HTTPS_PORT}:443/udp
|
||||||
networks:
|
|
||||||
- frontend
|
|
||||||
restart: unless-stopped
|
|
||||||
|
|
||||||
networks:
|
|
||||||
frontend:
|
|
||||||
external: true
|
|
||||||
|
Reference in New Issue
Block a user