fix(deploy): bust Docker build cache for Next.js client build

Reviewed-on: http://gitea.lan:3000/robbond/pleskSaas/pulls/45

Dockerfile

@@ -9,8 +9,10 @@ WORKDIR /app
 
 ARG NEXT_PUBLIC_SUPABASE_URL
 ARG NEXT_PUBLIC_SUPABASE_ANON_KEY
-ENV NEXT_PUBLIC_SUPABASE_URL=$NEXT_PUBLIC_SUPABASE_URL
+ARG BUILD_CACHE_BUSTER
-ENV NEXT_PUBLIC_SUPABASE_ANON_KEY=$NEXT_PUBLIC_SUPABASE_ANON_KEY
+ENV NEXT_PUBLIC_SUPABASE_URL=${NEXT_PUBLIC_SUPABASE_URL}
+ENV NEXT_PUBLIC_SUPABASE_ANON_KEY=${NEXT_PUBLIC_SUPABASE_ANON_KEY}
+ENV BUILD_CACHE_BUSTER=${BUILD_CACHE_BUSTER}
 
 COPY --from=deps /app/node_modules ./node_modules
 COPY . .

Jenkinsfile

@@ -78,7 +78,7 @@ pipeline {
           string(credentialsId: 'supabase-public-url', variable: 'NEXT_PUBLIC_SUPABASE_URL'),
           string(credentialsId: 'supabase-public-anon-key', variable: 'NEXT_PUBLIC_SUPABASE_ANON_KEY')
         ]) {
-          sh 'docker build --build-arg NEXT_PUBLIC_SUPABASE_URL="$NEXT_PUBLIC_SUPABASE_URL" --build-arg NEXT_PUBLIC_SUPABASE_ANON_KEY="$NEXT_PUBLIC_SUPABASE_ANON_KEY" -t ${IMAGE_LATEST} -t ${IMAGE_BUILD} .'
+          sh 'docker build --build-arg NEXT_PUBLIC_SUPABASE_URL="$NEXT_PUBLIC_SUPABASE_URL" --build-arg NEXT_PUBLIC_SUPABASE_ANON_KEY="$NEXT_PUBLIC_SUPABASE_ANON_KEY" --build-arg BUILD_CACHE_BUSTER="${BUILD_NUMBER}" -t ${IMAGE_LATEST} -t ${IMAGE_BUILD} .'
         }
       }
     }

scripts/smoke-check.sh

@@ -11,17 +11,26 @@ fi
 
 URL="${BASE_URL%/}/api/health"
 TMP_FILE="$(mktemp)"
+MAX_ATTEMPTS=20
+SLEEP_SECONDS=3
 
 trap 'rm -f "${TMP_FILE}"' EXIT
 
-HTTP_CODE=$(curl -sS -o "${TMP_FILE}" -w "%{http_code}" "${URL}")
+for attempt in $(seq 1 "${MAX_ATTEMPTS}"); do
+  HTTP_CODE=$(curl -sS -o "${TMP_FILE}" -w "%{http_code}" "${URL}" || echo "000")
 
-if [ "${HTTP_CODE}" != "200" ]; then
+  if [ "${HTTP_CODE}" = "200" ]; then
-  echo "Smoke check failed: ${URL} returned ${HTTP_CODE}" >&2
+    if node -e "const fs=require('fs');const d=JSON.parse(fs.readFileSync(process.argv[1],'utf8'));if(d?.ok!==true||typeof d?.service!=='string'){process.exit(1)}" "${TMP_FILE}"; then
-  cat "${TMP_FILE}" >&2 || true
+      echo "Smoke check passed: ${URL} (attempt ${attempt}/${MAX_ATTEMPTS})"
-  exit 1
+      exit 0
-fi
+    fi
+  fi
 
-node -e "const fs=require('fs');const d=JSON.parse(fs.readFileSync(process.argv[1],'utf8'));if(d?.ok!==true||typeof d?.service!=='string'){process.exit(1)}" "${TMP_FILE}"
+  if [ "${attempt}" -lt "${MAX_ATTEMPTS}" ]; then
+    sleep "${SLEEP_SECONDS}"
+  fi
+done
 
-echo "Smoke check passed: ${URL}"
+echo "Smoke check failed after ${MAX_ATTEMPTS} attempts: ${URL}" >&2
+cat "${TMP_FILE}" >&2 || true
+exit 1