Skip to content
/ app-api Public template
generated from yiisoft/package-template

Commit 242adc7

Browse files
authored
Merge branch 'master' into copilot/port-app-pull-443
2 parents 3030955 + 0694b6e commit 242adc7

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
## 1.2.1 under development
44

55
- Chg #272: Do not write logs to file since that's not needed for both Docker and `./yii serve` (@samdark)
6+
- Enh #271: Add "service update paused" case for swarm deployment log parsing (@samdark)
67

78
## 1.2.0 March 09, 2026
89

Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -127,14 +127,14 @@ ifeq ($(PRIMARY_GOAL),prod-deploy)
127127
prod-deploy: ## Deploy to production.
128128
@set -euo pipefail; \
129129
docker -H ${PROD_SSH} stack deploy --prune --detach=false --with-registry-auth -c docker/compose.yml -c docker/prod/compose.yml ${STACK_NAME} 2>&1 | tee deploy.log; \
130-
if grep -qiE 'rollback:|update rolled back' deploy.log; then \
130+
if grep -qiE 'rollback:|update rolled back|service update paused' deploy.log; then \
131131
FAILED_TASK_ID=$$(grep -oiE 'task[[:space:]]+[a-z0-9]+' deploy.log | head -n 1 | awk '{print $$2}'); \
132132
if [ -n "$${FAILED_TASK_ID}" ]; then \
133-
echo "Docker Swarm update rolled back; failing job. Failed task ID: $${FAILED_TASK_ID}"; \
133+
echo "Docker Swarm update failed. Failed task ID: $${FAILED_TASK_ID}"; \
134134
echo "--- docker service logs ($${FAILED_TASK_ID}) ---"; \
135135
docker -H ${PROD_SSH} service logs --timestamps --tail 500 "$${FAILED_TASK_ID}" || true; \
136136
else \
137-
echo 'Docker Swarm update rolled back; failing job. Failed task ID: not found in deploy output.'; \
137+
echo 'Docker Swarm update failed. Failed task ID: not found in deploy output.'; \
138138
fi; \
139139
exit 1; \
140140
fi

0 commit comments

Comments
 (0)