From 1308f016f22a40aa7d52a415a2e7d5d8231bba9d Mon Sep 17 00:00:00 2001 From: Roland Strunze <1+xosna@noreply.localhost> Date: Sun, 24 May 2026 09:45:02 +0200 Subject: [PATCH] docker-lxc.sh aktualisiert --- docker-lxc.sh | 38 +++++++++++++++++++++++++++----------- 1 file changed, 27 insertions(+), 11 deletions(-) diff --git a/docker-lxc.sh b/docker-lxc.sh index 915e5a8..ca047d4 100644 --- a/docker-lxc.sh +++ b/docker-lxc.sh @@ -30,7 +30,7 @@ echo -e "${BOLD}╚════════════════════ DEFAULT_CTID=$(pvesh get /cluster/nextid) DEFAULT_HOSTNAME="debian-docker" DEFAULT_PASSWORD="ChangeMe123!" -DEFAULT_DISK=32 # GB +DEFAULT_DISK=8 # GB DEFAULT_RAM=2048 # MB DEFAULT_SWAP=512 # MB DEFAULT_CORES=2 @@ -451,6 +451,15 @@ fi # ── Abschluss ────────────────────────────────────────────────────────────────── CONTAINER_IP=$(pct exec "$CTID" -- hostname -I 2>/dev/null | awk '{print $1}' || echo "unbekannt") +# Portainer-Timer zurücksetzen: erst hier neu starten, wenn alles fertig ist. +# So beginnt der 5-Minuten-Timeout erst jetzt – nicht während der Installation. +if $INSTALL_PORTAINER; then + info "Portainer-Timer zurücksetzen (Neustart nach Installation) …" + pct exec "$CTID" -- docker restart portainer &>/dev/null \ + && success "Portainer neu gestartet – 5-Minuten-Fenster beginnt jetzt." \ + || warn "Portainer-Neustart fehlgeschlagen – ggf. manuell: docker restart portainer" +fi + echo "" echo -e "${BOLD}${GREEN}╔═══════════════════════════════════════════════════════╗${NC}" echo -e "${GREEN}║${NC} ${BOLD}Installation abgeschlossen!${NC}" @@ -462,19 +471,26 @@ printf "${GREEN}║${NC} %-18s ${BOLD}%s${NC}\n" "IP-Adresse:" "$CONTAINER_ echo -e "${GREEN}║${NC}" printf "${GREEN}║${NC} %-18s ${BOLD}%s${NC}\n" "Docker:" "installiert & aktiv" if $INSTALL_PORTAINER; then -printf "${GREEN}║${NC} %-18s ${BOLD}https://%s:%s${NC}\n" "Portainer UI:" "$CONTAINER_IP" "$PORTAINER_PORT" + printf "${GREEN}║${NC} %-18s ${BOLD}https://%s:%s${NC}\n" "Portainer UI:" "$CONTAINER_IP" "$PORTAINER_PORT" + echo -e "${GREEN}║${NC} ${YELLOW} ⏱ Bitte innerhalb von 5 Min. Admin-Account anlegen!${NC}" fi if $ENABLE_ROOT_SSH; then -echo -e "${GREEN}║${NC}" -echo -e "${GREEN}║${NC} ${CYAN}── SSH-Verbindung ─────────────────────────────────${NC}" -if [[ "$SSH_PORT" == "22" ]]; then -printf "${GREEN}║${NC} ${BOLD}ssh root@%s${NC}\n" "$CONTAINER_IP" -else -printf "${GREEN}║${NC} ${BOLD}ssh root@%s -p %s${NC}\n" "$CONTAINER_IP" "$SSH_PORT" -fi -printf "${GREEN}║${NC} %-18s ${BOLD}%s${NC}\n" "Auth-Methode:" "$SSH_AUTH" + echo -e "${GREEN}║${NC}" + echo -e "${GREEN}║${NC} ${CYAN}── SSH-Verbindung ──────────────────────────────────${NC}" + if [[ "$SSH_PORT" == "22" ]]; then + printf "${GREEN}║${NC} ${BOLD}ssh root@%s${NC}\n" "$CONTAINER_IP" + else + printf "${GREEN}║${NC} ${BOLD}ssh root@%s -p %s${NC}\n" "$CONTAINER_IP" "$SSH_PORT" + fi + printf "${GREEN}║${NC} %-18s ${BOLD}%s${NC}\n" "Auth-Methode:" "$SSH_AUTH" fi echo -e "${GREEN}║${NC}" echo -e "${GREEN}║${NC} ${YELLOW}⚠ Root-Passwort nach erstem Login bitte ändern!${NC}" echo -e "${GREEN}║${NC}" -echo -e "${BOLD}${GREEN}╚═══════════════════════════════════════════════════════╝${NC}" \ No newline at end of file +echo -e "${BOLD}${GREEN}╚═══════════════════════════════════════════════════════╝${NC}" + +if $INSTALL_PORTAINER; then + echo "" + echo -e "${YELLOW} Portainer Timeout? →${NC} ${BOLD}pct exec ${CTID} -- docker restart portainer${NC}" +fi +echo "" \ No newline at end of file