robbond/pleskSaas
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Merge pull request 'fix(deploy): reliably transfer exact build image and simplify production deploy scripts' (#49) from fix/cl9-reliable-image-deploy-and-script-sync into master

Browse Source 
Reviewed-on: http://gitea.lan:3000/robbond/pleskSaas/pulls/49
This commit was merged in pull request #49.
This commit is contained in:
robbond
2026-03-07 08:14:51 +00:00
parent ea57734fa8 23ad8af20e
commit 2915f10315
3 changed files with 33 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
Jenkinsfile vendored
View File

@@ -105,8 +105,21 @@ rsync -az \
scripts/ \
"$APP_USER@$APP_HOST:$DEPLOY_PATH/scripts/"
docker save ${IMAGE_LATEST} ${IMAGE_BUILD} \
| ssh -i "$SSH_KEY" "$APP_USER@$APP_HOST" 'docker load'
echo "Deploying image tag: ${IMAGE_BUILD}"
IMAGE_TAR="plesk-agency-portal-build-${BUILD_NUMBER}.tar"
echo "Creating image archive: ${IMAGE_TAR}"
docker save -o "${IMAGE_TAR}" "${IMAGE_BUILD}"
ls -lh "${IMAGE_TAR}"
echo "Copying image archive to remote host"
rsync -az \
-e "ssh -i $SSH_KEY" \
"${IMAGE_TAR}" \
"$APP_USER@$APP_HOST:$DEPLOY_PATH/"
echo "Loading image archive on remote host"
ssh -i "$SSH_KEY" "$APP_USER@$APP_HOST" "docker load -i $DEPLOY_PATH/${IMAGE_TAR}"
ssh -i "$SSH_KEY" "$APP_USER@$APP_HOST" "docker images | grep plesk-agency-portal || true"

7
scripts/deploy-prod.sh
View File

@@ -12,8 +12,13 @@ if [ ! -f "${DEPLOY_PATH}/docker-compose.prod.yml" ]; then
exit 1
fi
if [ ! -f "${DEPLOY_PATH}/.env" ]; then
echo "Missing .env in ${DEPLOY_PATH}" >&2
exit 1
fi
cd "${DEPLOY_PATH}"
APP_IMAGE="${APP_IMAGE}" docker compose -f docker-compose.prod.yml up -d --no-build --force-recreate
docker compose -f docker-compose.prod.yml ps
APP_IMAGE="${APP_IMAGE}" docker compose -f docker-compose.prod.yml ps

14
scripts/rollback-prod.sh
View File

@@ -21,10 +21,20 @@ if [ ! -f "${DEPLOY_PATH}/docker-compose.prod.yml" ]; then
exit 1
fi
if [ ! -f "${DEPLOY_PATH}/.env" ]; then
echo "Missing .env in ${DEPLOY_PATH}" >&2
exit 1
fi
if [ ! -f "${DEPLOY_PATH}/scripts/smoke-check.sh" ]; then
echo "Missing scripts/smoke-check.sh in ${DEPLOY_PATH}" >&2
exit 1
fi
cd "${DEPLOY_PATH}"
APP_IMAGE="${PREVIOUS_IMAGE_TAG}" docker compose -f docker-compose.prod.yml up -d --no-build
APP_IMAGE="${PREVIOUS_IMAGE_TAG}" docker compose -f docker-compose.prod.yml up -d --no-build --force-recreate
"${DEPLOY_PATH}/smoke-check.sh" "${APP_BASE_URL}"
"${DEPLOY_PATH}/scripts/smoke-check.sh" "${APP_BASE_URL}"
docker compose -f docker-compose.prod.yml ps