commented out prefilight docker check

Dockerfile

@@ -1,23 +1,23 @@
-FROM node:20-bookworm-slim AS deps
+FROM cgr.dev/chainguard/node:20-dev AS deps
 WORKDIR /app
 
 COPY package.json package-lock.json ./
 RUN npm ci
 
-FROM node:20-bookworm-slim AS builder
+FROM cgr.dev/chainguard/node:20-dev AS builder
 WORKDIR /app
 
 COPY --from=deps /app/node_modules ./node_modules
 COPY . .
 RUN npm run build
 
-FROM node:20-bookworm-slim AS prod-deps
+FROM cgr.dev/chainguard/node:20-dev AS prod-deps
 WORKDIR /app
 
 COPY package.json package-lock.json ./
 RUN npm ci --omit=dev
 
-FROM node:20-bookworm-slim AS runner
+FROM cgr.dev/chainguard/node:20 AS runner
 WORKDIR /app
 
 ENV NODE_ENV=production

Jenkinsfile

@@ -7,12 +7,6 @@ pipeline {
     REGISTRY_IMAGE = "plesk-agency-portal"
     IMAGE_LATEST = "${REGISTRY_IMAGE}:latest"
     IMAGE_BUILD = "${REGISTRY_IMAGE}:build-${BUILD_NUMBER}"
-    DEPLOY_SSH_CREDENTIAL_ID = "${env.DEPLOY_SSH_CREDENTIAL_ID ?: 'plesk-agency-deploy-key'}"
-    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}"
-
   }
 
   stages {
@@ -72,37 +66,32 @@ pipeline {
       }
     }
 
-stage('Deploy') {
+    stage('Deploy') {
-  steps {
+      steps {
-    withCredentials([sshUserPrivateKey(
+        script {
-      credentialsId: "${env.DEPLOY_SSH_CREDENTIAL_ID}",
+          if (!env.DEPLOY_SSH_CREDENTIAL_ID) {
-      keyFileVariable: 'SSH_KEY'
+            error 'DEPLOY_SSH_CREDENTIAL_ID is required'
-    )]) {
+          }
-      sh '''
+        }
-    bash -eo pipefail << 'EOF'
+        sshagent(credentials: ["${env.DEPLOY_SSH_CREDENTIAL_ID}"]) {
-    set -euo pipefail
+          sh '''
+            set -euo pipefail
+            : "${DEPLOY_SSH_HOST:?Missing DEPLOY_SSH_HOST}"
+            : "${DEPLOY_SSH_USER:?Missing DEPLOY_SSH_USER}"
+            : "${DEPLOY_PATH:?Missing DEPLOY_PATH}"
 
-    ssh -i "$SSH_KEY" "$APP_USER@$APP_HOST" "mkdir -p $DEPLOY_PATH/scripts"
+            rsync -az \
+              docker-compose.prod.yml \
+              scripts/deploy-prod.sh \
+              scripts/smoke-check.sh \
+              scripts/rollback-prod.sh \
+              ${DEPLOY_SSH_USER}@${DEPLOY_SSH_HOST}:${DEPLOY_PATH}/
 
-    rsync -az \
+            docker save ${IMAGE_LATEST} ${IMAGE_BUILD} \
-      -e "ssh -i $SSH_KEY" \
+              | ssh ${DEPLOY_SSH_USER}@${DEPLOY_SSH_HOST} 'docker load'
-      docker-compose.prod.yml \
-      "$APP_USER@$APP_HOST:$DEPLOY_PATH/"
 
-    rsync -az \
+            ssh ${DEPLOY_SSH_USER}@${DEPLOY_SSH_HOST} \
-      -e "ssh -i $SSH_KEY" \
+              "chmod +x ${DEPLOY_PATH}/deploy-prod.sh ${DEPLOY_PATH}/smoke-check.sh ${DEPLOY_PATH}/rollback-prod.sh && APP_IMAGE='${IMAGE_BUILD}' DEPLOY_PATH='${DEPLOY_PATH}' ${DEPLOY_PATH}/deploy-prod.sh"
-      scripts/ \
-      "$APP_USER@$APP_HOST:$DEPLOY_PATH/scripts/"
-
-    docker save ${IMAGE_LATEST} ${IMAGE_BUILD} \
-      | ssh -i "$SSH_KEY" "$APP_USER@$APP_HOST" 'docker load'
-
-    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" \
-      "cd $DEPLOY_PATH && ./scripts/deploy-prod.sh"
-    EOF
           '''
         }
       }
@@ -110,13 +99,7 @@ stage('Deploy') {
 
     stage('Smoke check') {
       steps {
-        sh '''
+        sh 'chmod +x scripts/smoke-check.sh && scripts/smoke-check.sh ${APP_BASE_URL}'
-bash -eo pipefail << EOF
-set -euo pipefail
-chmod +x scripts/smoke-check.sh
-scripts/smoke-check.sh "${APP_BASE_URL}"
-EOF
-'''
       }
     }
   }