fix(deploy): add smoke check retries and pass public Supabase build env

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

Dockerfile

@@ -7,6 +7,11 @@ RUN npm ci
 FROM node:20-bookworm-slim AS builder
 WORKDIR /app
 
+ARG NEXT_PUBLIC_SUPABASE_URL
+ARG 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}
+
 COPY --from=deps /app/node_modules ./node_modules
 COPY . .
 RUN npm run build

Jenkinsfile

@@ -11,7 +11,9 @@ pipeline {
     APP_HOST = "${env.APP_HOST ?: '192.168.68.89'}"
     APP_USER = "${env.APP_USER ?: 'deploy'}"
     DEPLOY_PATH = "${env.DEPLOY_PATH ?: '/opt/plesk-agency-portal'}"
-    APP_BASE_URL = "${env.APP_BASE_URL ?: 'https://portal.rdbcloud.co.uk}"
+    APP_BASE_URL = "${env.APP_BASE_URL ?: 'http://192.168.68.89:3000'}"
+    NEXT_PUBLIC_SUPABASE_URL = "${env.NEXT_PUBLIC_SUPABASE_URL ?: ''}"
+    NEXT_PUBLIC_SUPABASE_ANON_KEY = "${env.NEXT_PUBLIC_SUPABASE_ANON_KEY ?: ''}"
 
   }
 
@@ -68,7 +70,7 @@ pipeline {
 
     stage('Build Docker image') {
       steps {
-        sh 'docker build -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}" -t ${IMAGE_LATEST} -t ${IMAGE_BUILD} .'
       }
     }
 
@@ -79,34 +81,34 @@ stage('Deploy') {
       keyFileVariable: 'SSH_KEY'
     )]) {
       sh '''
-    bash -eo pipefail << 'EOF'
+bash -eo pipefail << 'EOF'
-    set -euo pipefail
+set -euo pipefail
 
-    ssh -i "$SSH_KEY" "$APP_USER@$APP_HOST" "mkdir -p $DEPLOY_PATH/scripts"
+ssh -i "$SSH_KEY" "$APP_USER@$APP_HOST" "mkdir -p $DEPLOY_PATH/scripts"
 
-    rsync -az \
+rsync -az \
   -e "ssh -i $SSH_KEY" \
   docker-compose.prod.yml \
   "$APP_USER@$APP_HOST:$DEPLOY_PATH/"
 
-    rsync -az \
+rsync -az \
   -e "ssh -i $SSH_KEY" \
   scripts/ \
   "$APP_USER@$APP_HOST:$DEPLOY_PATH/scripts/"
 
-    docker save ${IMAGE_LATEST} ${IMAGE_BUILD} \
+docker save ${IMAGE_LATEST} ${IMAGE_BUILD} \
   | ssh -i "$SSH_KEY" "$APP_USER@$APP_HOST" 'docker load'
 
-    ssh -i "$SSH_KEY" "$APP_USER@$APP_HOST" \
+ssh -i "$SSH_KEY" "$APP_USER@$APP_HOST" \
   "cd $DEPLOY_PATH && chmod +x ./scripts/deploy-prod.sh ./scripts/smoke-check.sh ./scripts/rollback-prod.sh"
 
-    ssh -i "$SSH_KEY" "$APP_USER@$APP_HOST" \
+ssh -i "$SSH_KEY" "$APP_USER@$APP_HOST" \
   "cd $DEPLOY_PATH && ./scripts/deploy-prod.sh"
-    EOF
+EOF
       '''
     }
   }
-    }
+}
 
     stage('Smoke check') {
       steps {

docker-compose.prod.yml

@@ -2,9 +2,6 @@ services:
   web:
     container_name: plesk-agency-portal
     image: ${APP_IMAGE:-plesk-agency-portal:latest}
-    build:
-      context: .
-      dockerfile: Dockerfile
     restart: unless-stopped
     env_file:
       - .env

scripts/deploy-prod.sh

@@ -4,20 +4,9 @@ set -euo pipefail
 
 DEPLOY_PATH="${DEPLOY_PATH:-/opt/plesk-agency-portal}"
 APP_IMAGE="${APP_IMAGE:-plesk-agency-portal:latest}"
-SOURCE_PATH="${SOURCE_PATH:-${DEPLOY_PATH}}"
 
 mkdir -p "${DEPLOY_PATH}"
 
-for file in docker-compose.prod.yml deploy-prod.sh smoke-check.sh rollback-prod.sh; do
-  if [ -f "${SOURCE_PATH}/${file}" ]; then
-    cp "${SOURCE_PATH}/${file}" "${DEPLOY_PATH}/${file}"
-  fi
-done
-
-chmod +x "${DEPLOY_PATH}/deploy-prod.sh" \
-  "${DEPLOY_PATH}/smoke-check.sh" \
-  "${DEPLOY_PATH}/rollback-prod.sh" 2>/dev/null || true
-
 if [ ! -f "${DEPLOY_PATH}/docker-compose.prod.yml" ]; then
   echo "Missing docker-compose.prod.yml in ${DEPLOY_PATH}" >&2
   exit 1
@@ -25,6 +14,6 @@ fi
 
 cd "${DEPLOY_PATH}"
 
-APP_IMAGE="${APP_IMAGE}" docker compose -f docker-compose.prod.yml up -d --no-build
+APP_IMAGE="${APP_IMAGE}" docker compose -f docker-compose.prod.yml up -d
 
 docker compose -f docker-compose.prod.yml ps

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