From daf6ccd0e4a3c5603f2cb440465762341a54911e Mon Sep 17 00:00:00 2001
From: MichaelFisher1997 <contact@michaelfisher.tech>
Date: Sun, 26 Apr 2026 09:43:31 +0000
Subject: [PATCH] fix: retry bootstrap image imports

---
 .gitea/workflows/deploy.yml | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml
index 5f3c0f0..b5decc9 100644
--- a/.gitea/workflows/deploy.yml
+++ b/.gitea/workflows/deploy.yml
@@ -533,7 +533,16 @@ jobs:
             scp -i "$HOME/.ssh/id_ed25519" -o StrictHostKeyChecking=no -o ConnectTimeout=10 \
               "${archive_path}" "ubuntu@${host_ip}:/tmp/${archive_name}"
             ssh -i "$HOME/.ssh/id_ed25519" -o StrictHostKeyChecking=no -o ConnectTimeout=10 "ubuntu@${host_ip}" \
-              "sudo k3s ctr -n k8s.io images import '/tmp/${archive_name}' && sudo k3s crictl inspecti '${image}' >/dev/null"
+              "set -euo pipefail; \
+              if sudo k3s crictl inspecti '${image}' >/dev/null 2>&1; then exit 0; fi; \
+              for attempt in 1 2 3 4 5; do \
+                echo 'Importing ${image} archive with ctr'; \
+                if sudo k3s ctr -n k8s.io images import '/tmp/${archive_name}' && sudo k3s crictl inspecti '${image}' >/dev/null; then exit 0; fi; \
+                sleep 10; \
+              done; \
+              sudo systemctl status k3s --no-pager -l || true; \
+              sudo journalctl -u k3s -n 80 --no-pager || true; \
+              exit 1"
           }
 
           eso_diagnostics() {