From 365cec206d629ce82a8fe12b36854c1783c2fa34 Mon Sep 17 00:00:00 2001 From: florianfederspiel Date: Wed, 3 Jun 2026 15:15:33 +0200 Subject: [PATCH] KI-AGENT: Selfhost-Netzwerke beim Setup bereinigen --- scripts/selfhost-setup.sh | 31 ++++++++++++++++++++++++++++--- 1 file changed, 28 insertions(+), 3 deletions(-) diff --git a/scripts/selfhost-setup.sh b/scripts/selfhost-setup.sh index 87bac5f..17aa715 100755 --- a/scripts/selfhost-setup.sh +++ b/scripts/selfhost-setup.sh @@ -30,6 +30,14 @@ read_interactive() { fi } +docker_engine() { + if [[ "${FEDEO_USE_SUDO_DOCKER:-false}" == "true" ]]; then + sudo docker "$@" + else + docker "$@" + fi +} + compose() { if [[ "${FEDEO_USE_SUDO_DOCKER:-false}" == "true" ]]; then sudo docker compose "$@" @@ -44,12 +52,27 @@ compose_stack() { compose_start_command() { if [[ "${FEDEO_USE_SUDO_DOCKER:-false}" == "true" ]]; then - echo "sudo docker compose --env-file $ENV_FILE -f $COMPOSE_FILE up -d" + echo "sudo docker compose --env-file $ENV_FILE -f $COMPOSE_FILE up -d --remove-orphans" else - echo "docker compose --env-file $ENV_FILE -f $COMPOSE_FILE up -d" + echo "docker compose --env-file $ENV_FILE -f $COMPOSE_FILE up -d --remove-orphans" fi } +remove_selfhost_networks() { + local network + + for network in fedeo_web fedeo_internal; do + if docker_engine network inspect "$network" >/dev/null 2>&1; then + if docker_engine network rm "$network" >/dev/null 2>&1; then + echo "Docker-Netzwerk entfernt: $network" + else + echo "Docker-Netzwerk konnte nicht entfernt werden: $network" + echo "Prüfe laufende Container mit: docker network inspect $network" + fi + fi + done +} + usage() { cat <<'USAGE' FEDEO Selfhost Setup @@ -461,6 +484,8 @@ uninstall_stack() { "$ROOT_DIR/traefik/letsencrypt" \ "$ROOT_DIR/traefik/logs" + remove_selfhost_networks + echo echo "Uninstall inklusive lokaler Daten abgeschlossen." } @@ -597,7 +622,7 @@ main() { fi if [[ "$START_STACK" == "yes" ]]; then - compose_stack up -d + compose_stack up -d --remove-orphans else echo echo "Start später mit:"