From 5c003daafa9d56066e6a1a7356f7b6f2aedb5ced Mon Sep 17 00:00:00 2001 From: Dorian Date: Thu, 2 Apr 2026 15:16:24 +0100 Subject: [PATCH] fix: stale rootfs container cleanup, OnlyOffice/NPM port corrections ISO build: - Remove stale archipelago-rootfs-tmp container before creating new one (previous failed builds leave it behind, blocking subsequent builds) Container ports: - OnlyOffice: fix LAN address from 8044 to 9980 (actual mapped port) - Nginx Proxy Manager: fix from 8181 to 81 (correct admin port) Co-Authored-By: Claude Opus 4.6 (1M context) --- core/container/src/podman_client.rs | 4 ++-- image-recipe/build-auto-installer-iso.sh | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/core/container/src/podman_client.rs b/core/container/src/podman_client.rs index 7ecdd66e..b69a58e3 100644 --- a/core/container/src/podman_client.rs +++ b/core/container/src/podman_client.rs @@ -116,7 +116,7 @@ impl PodmanClient { "grafana" => "http://localhost:3000", "searxng" => "http://localhost:8888", "ollama" => "http://localhost:11434", - "onlyoffice" => "http://localhost:8044", + "onlyoffice" => "http://localhost:9980", "penpot" => "http://localhost:9001", "nextcloud" => "http://localhost:8085", "vaultwarden" => "http://localhost:8082", @@ -124,7 +124,7 @@ impl PodmanClient { "photoprism" => "http://localhost:2342", "immich_server" | "immich" => "http://localhost:2283", "filebrowser" => "http://localhost:8083", - "nginx-proxy-manager" => "http://localhost:8181", + "nginx-proxy-manager" => "http://localhost:81", "portainer" => "http://localhost:9000", "uptime-kuma" => "http://localhost:3001", "fedimint" | "fedimintd" => "http://localhost:8175", diff --git a/image-recipe/build-auto-installer-iso.sh b/image-recipe/build-auto-installer-iso.sh index c9883510..ffbac8b1 100755 --- a/image-recipe/build-auto-installer-iso.sh +++ b/image-recipe/build-auto-installer-iso.sh @@ -502,6 +502,7 @@ SYSTEMDSERVICE $CONTAINER_CMD build --no-cache --platform $CONTAINER_PLATFORM -t archipelago-rootfs -f "$WORK_DIR/Dockerfile.rootfs" "$WORK_DIR" echo " Exporting filesystem..." + $CONTAINER_CMD rm -f archipelago-rootfs-tmp 2>/dev/null || true $CONTAINER_CMD create --platform $CONTAINER_PLATFORM --name archipelago-rootfs-tmp archipelago-rootfs $CONTAINER_CMD export archipelago-rootfs-tmp > "$ROOTFS_TAR" $CONTAINER_CMD rm archipelago-rootfs-tmp @@ -1368,6 +1369,9 @@ chown -R 100000:100000 /var/lib/archipelago/data # Enable linger so rootless podman containers survive logout loginctl enable-linger archipelago 2>/dev/null || true +# Enable podman-restart so containers with --restart=unless-stopped auto-start on boot +runuser -u archipelago -- bash -c 'export XDG_RUNTIME_DIR=/run/user/1000 && systemctl --user enable podman-restart.service' 2>>"$LOG" || true + # Ensure podman socket is active for archipelago user runuser -u archipelago -- bash -c 'export XDG_RUNTIME_DIR=/run/user/1000 && systemctl --user enable --now podman.socket' 2>>"$LOG" || true