fix: pod cleanup loop, healthcheck in all compose files
This commit is contained in:
parent
8770476d61
commit
414ead35d0
4 changed files with 17 additions and 2 deletions
|
|
@ -9,6 +9,11 @@ services:
|
||||||
volumes:
|
volumes:
|
||||||
- /opt/nextworkspace/config/authelia/:/config/
|
- /opt/nextworkspace/config/authelia/:/config/
|
||||||
- /opt/nextworkspace/data/authelia/:/data/
|
- /opt/nextworkspace/data/authelia/:/data/
|
||||||
|
healthcheck:
|
||||||
|
test: ["CMD", "wget", "-qO-", "http://127.0.0.1:9091/api/health"]
|
||||||
|
interval: 30s
|
||||||
|
timeout: 10s
|
||||||
|
retries: 3
|
||||||
networks:
|
networks:
|
||||||
- nextwks-net
|
- nextwks-net
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -11,6 +11,11 @@ services:
|
||||||
- /opt/nextworkspace/data/caddy/:/data/
|
- /opt/nextworkspace/data/caddy/:/data/
|
||||||
- /opt/nextworkspace/logs/caddy/:/var/log/caddy/
|
- /opt/nextworkspace/logs/caddy/:/var/log/caddy/
|
||||||
- /opt/nextworkspace/www/:/opt/nextworkspace/www/
|
- /opt/nextworkspace/www/:/opt/nextworkspace/www/
|
||||||
|
healthcheck:
|
||||||
|
test: ["CMD", "wget", "-qO-", "http://127.0.0.1:80/"]
|
||||||
|
interval: 30s
|
||||||
|
timeout: 10s
|
||||||
|
retries: 3
|
||||||
networks:
|
networks:
|
||||||
- nextwks-net
|
- nextwks-net
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -12,6 +12,11 @@ services:
|
||||||
env_file: /opt/nextworkspace/.env
|
env_file: /opt/nextworkspace/.env
|
||||||
environment:
|
environment:
|
||||||
- CONFIG_DIR=/opt/nextworkspace/config/nextworkspace
|
- CONFIG_DIR=/opt/nextworkspace/config/nextworkspace
|
||||||
|
healthcheck:
|
||||||
|
test: ["CMD", "wget", "-qO-", "http://127.0.0.1:9000/health"]
|
||||||
|
interval: 30s
|
||||||
|
timeout: 10s
|
||||||
|
retries: 3
|
||||||
networks:
|
networks:
|
||||||
- nextwks-net
|
- nextwks-net
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -39,8 +39,8 @@ if [ "$GREENFIELD" = true ]; then
|
||||||
systemctl disable nextworkspace 2>/dev/null || true
|
systemctl disable nextworkspace 2>/dev/null || true
|
||||||
rm -f /etc/systemd/system/nextworkspace.service
|
rm -f /etc/systemd/system/nextworkspace.service
|
||||||
systemctl daemon-reload
|
systemctl daemon-reload
|
||||||
# Force clean all old pods and containers
|
# Force clean ALL old pods, containers, and networks
|
||||||
podman pod rm -f -a 2>/dev/null || true
|
for p in $(podman pod ls -q 2>/dev/null); do podman pod rm -f "$p" 2>/dev/null || true; done
|
||||||
podman rm -f caddy authelia launcher 2>/dev/null || true
|
podman rm -f caddy authelia launcher 2>/dev/null || true
|
||||||
podman network rm "$NETWORK_NAME" 2>/dev/null || true
|
podman network rm "$NETWORK_NAME" 2>/dev/null || true
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue