From 26ea4ce136f1bfa5f2ca5d7367181270c65b056e Mon Sep 17 00:00:00 2001
From: copilotcoder <copilotcoder@darkhelm.org>
Date: Wed, 8 Jul 2026 12:39:29 -0400
Subject: [PATCH] Retry base image registry operations on transient resets

---
 .gitea/workflows/cicd.yaml | 68 +++++++++++++++++++++++++++++++++++---
 1 file changed, 64 insertions(+), 4 deletions(-)

diff --git a/.gitea/workflows/cicd.yaml b/.gitea/workflows/cicd.yaml
index 83eaaa2..3209289 100644
--- a/.gitea/workflows/cicd.yaml
+++ b/.gitea/workflows/cicd.yaml
@@ -623,14 +623,44 @@ jobs:
         run: |
           set -euo pipefail
 
+          retry_registry_op() {
+            op_name="$1"
+            image_ref="$2"
+            attempts="${3:-5}"
+            backoff="${4:-3}"
+            attempt=1
+
+            while [ "${attempt}" -le "${attempts}" ]; do
+              echo "${op_name} attempt ${attempt}/${attempts} for ${image_ref}"
+              if [ "${op_name}" = "push" ]; then
+                if docker push "${image_ref}"; then
+                  return 0
+                fi
+              else
+                if docker pull "${image_ref}" >/dev/null; then
+                  return 0
+                fi
+              fi
+
+              if [ "${attempt}" -lt "${attempts}" ]; then
+                sleep_seconds=$((backoff * attempt))
+                echo "Retrying in ${sleep_seconds}s"
+                sleep "${sleep_seconds}"
+              fi
+              attempt=$((attempt + 1))
+            done
+
+            return 1
+          }
+
           echo "${PACKAGE_ACCESS_TOKEN}" | docker login "http://${GITEA_REGISTRY}" -u "${REGISTRY_USER}" --password-stdin
           BACKEND_BASE_REPO="${GITEA_REGISTRY}/darkhelm.org/plex-playlist-backend-base"
           BACKEND_BASE_TAG_REF="${BACKEND_BASE_REPO}:${HEAD_SHA}"
 
           docker build -f Dockerfile.backend --target dependencies -t plex-playlist-backend-base:"${HEAD_SHA}" .
           docker tag plex-playlist-backend-base:"${HEAD_SHA}" "${BACKEND_BASE_TAG_REF}"
-          docker push "${BACKEND_BASE_TAG_REF}"
-          docker pull "${BACKEND_BASE_TAG_REF}" >/dev/null
+          retry_registry_op push "${BACKEND_BASE_TAG_REF}" 5 4
+          retry_registry_op pull "${BACKEND_BASE_TAG_REF}" 5 3
 
           BACKEND_BASE_DIGEST_REF="$({ docker image inspect --format '{{range .RepoDigests}}{{println .}}{{end}}' "${BACKEND_BASE_TAG_REF}" | grep "^${BACKEND_BASE_REPO}@sha256:" | head -n 1; } || true)"
           if [ -z "${BACKEND_BASE_DIGEST_REF}" ]; then
@@ -693,14 +723,44 @@ jobs:
         run: |
           set -euo pipefail
 
+          retry_registry_op() {
+            op_name="$1"
+            image_ref="$2"
+            attempts="${3:-5}"
+            backoff="${4:-3}"
+            attempt=1
+
+            while [ "${attempt}" -le "${attempts}" ]; do
+              echo "${op_name} attempt ${attempt}/${attempts} for ${image_ref}"
+              if [ "${op_name}" = "push" ]; then
+                if docker push "${image_ref}"; then
+                  return 0
+                fi
+              else
+                if docker pull "${image_ref}" >/dev/null; then
+                  return 0
+                fi
+              fi
+
+              if [ "${attempt}" -lt "${attempts}" ]; then
+                sleep_seconds=$((backoff * attempt))
+                echo "Retrying in ${sleep_seconds}s"
+                sleep "${sleep_seconds}"
+              fi
+              attempt=$((attempt + 1))
+            done
+
+            return 1
+          }
+
           echo "${PACKAGE_ACCESS_TOKEN}" | docker login "http://${GITEA_REGISTRY}" -u "${REGISTRY_USER}" --password-stdin
           FRONTEND_BASE_REPO="${GITEA_REGISTRY}/darkhelm.org/plex-playlist-frontend-base"
           FRONTEND_BASE_TAG_REF="${FRONTEND_BASE_REPO}:${HEAD_SHA}"
 
           docker build -f Dockerfile.frontend --target deps -t plex-playlist-frontend-base:"${HEAD_SHA}" .
           docker tag plex-playlist-frontend-base:"${HEAD_SHA}" "${FRONTEND_BASE_TAG_REF}"
-          docker push "${FRONTEND_BASE_TAG_REF}"
-          docker pull "${FRONTEND_BASE_TAG_REF}" >/dev/null
+          retry_registry_op push "${FRONTEND_BASE_TAG_REF}" 5 4
+          retry_registry_op pull "${FRONTEND_BASE_TAG_REF}" 5 3
 
           FRONTEND_BASE_DIGEST_REF="$({ docker image inspect --format '{{range .RepoDigests}}{{println .}}{{end}}' "${FRONTEND_BASE_TAG_REF}" | grep "^${FRONTEND_BASE_REPO}@sha256:" | head -n 1; } || true)"
           if [ -z "${FRONTEND_BASE_DIGEST_REF}" ]; then