From 09dc756230b771041ab5df83f9dc9ae2f643aaa4 Mon Sep 17 00:00:00 2001
From: Josh <jcoakley@aptivaai.com>
Date: Thu, 31 Jul 2025 15:18:45 +0000
Subject: [PATCH] pipeline build v24 - TAG slicing

---
 .woodpecker.yml | 26 ++++++++++----------------
 1 file changed, 10 insertions(+), 16 deletions(-)

diff --git a/.woodpecker.yml b/.woodpecker.yml
index 32f2147..8a1c9ba 100644
--- a/.woodpecker.yml
+++ b/.woodpecker.yml
@@ -9,7 +9,7 @@ steps:
 
         mkdir -p ~/.ssh
 
-        # ── Secrets for SSH ────────────────────────────────────────
+        # ── Inject known-hosts and SSH key from Secret Manager ─────
         gcloud secrets versions access latest \
           --secret=STAGING_KNOWN_HOSTS --project=aptivaai-dev \
           | base64 -d > ~/.ssh/known_hosts
@@ -22,36 +22,30 @@ steps:
 
         echo "🔑 SSH prerequisites installed"
 
-        # ── Log what the CI knows ──────────────────────────────────
-        echo "🔍 CI_COMMIT_SHA: ${CI_COMMIT_SHA:-unset}"
-        echo "🔍 CI_COMMIT: ${CI_COMMIT:-unset}"
-        echo "🔍 DRONE_COMMIT_SHA: ${DRONE_COMMIT_SHA:-unset}"
-
-        # ── Resolve tag safely ─────────────────────────────────────
-        RAW_SHA="${CI_COMMIT_SHA:-${CI_COMMIT:-${DRONE_COMMIT_SHA:-}}}"
-        if [ -z "$RAW_SHA" ]; then
-          echo "❌ CI commit SHA not found. Aborting."
+        # ── Tag slicing from CI_COMMIT_SHA only ────────────────────
+        TAG=$(echo "${CI_COMMIT_SHA}" | head -c 8)
+        if [ -z "$TAG" ]; then
+          echo "❌ CI_COMMIT_SHA is missing or blank"
           exit 1
         fi
-        TAG=$(echo "$RAW_SHA" | head -c 8)
+
         echo "🚀 Deploying tag ${TAG} to staging"
 
-        # ── SSH into staging and refresh ───────────────────────────
+        # ── SSH into staging and refresh the Docker stack ──────────
         ssh -o StrictHostKeyChecking=yes \
             -i ~/.ssh/id_ed25519 \
             jcoakley@10.128.0.12 \
             "export IMG_TAG=${TAG}; \
              cd /home/jcoakley/aptiva-staging-app; \
-             echo 'Pulling containers with IMG_TAG=${IMG_TAG}'; \
+             echo 'IMG_TAG = ${IMG_TAG}'; \
+             echo '→ Pulling containers'; \
              docker compose pull; \
-             echo 'Recreating services'; \
+             echo '→ Recreating services'; \
              docker compose up -d --force-recreate --remove-orphans; \
              echo '✅ Staging stack refreshed with tag ${IMG_TAG}'"
 
 environment:
   CI_COMMIT_SHA: ${CI_COMMIT_SHA}
-  CI_COMMIT: ${CI_COMMIT}
-  DRONE_COMMIT_SHA: ${DRONE_COMMIT_SHA}
 
 when:
   event: