update

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

Dockerfile

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

Jenkinsfile

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