diff --git a/.github/workflows/application.yml b/.github/workflows/application.yml index bae9be48..e92b653a 100644 --- a/.github/workflows/application.yml +++ b/.github/workflows/application.yml @@ -61,7 +61,9 @@ jobs: - name: Процессы работают не от root run: | - docker compose top | awk 'NR>1 && $3=="0" {print; bad=1} END {exit bad}' + for id in $(docker compose ps -q); do + docker top "$id" -eo pid,uid,comm | awk 'NR>1 && $2==0 {print; bad=1} END {exit bad}' || exit 1 + done - name: Корректная остановка реплик API по SIGTERM run: | diff --git a/Makefile b/Makefile index 74fd3fde..7f7e8426 100644 --- a/Makefile +++ b/Makefile @@ -77,6 +77,7 @@ secrets: up: secrets $(COMPOSE) up -d --build --wait + scripts/lb-wait.sh down: $(COMPOSE) --profile bench down diff --git a/openspec/changes/close-lab3-second-review-gaps/tasks.md b/openspec/changes/close-lab3-second-review-gaps/tasks.md index 1e5546bd..9b2a5865 100644 --- a/openspec/changes/close-lab3-second-review-gaps/tasks.md +++ b/openspec/changes/close-lab3-second-review-gaps/tasks.md @@ -9,9 +9,9 @@ ## 2. Стенд и CI -- [ ] 2.1 `make up` ждёт все реплики в LB (`scripts/lb-wait.sh`) +- [x] 2.1 `make up` ждёт все реплики в LB (`scripts/lb-wait.sh`) - [ ] 2.2 CI: non-root по числовому uid `docker top -eo pid,uid,comm`; шаг `make retry-check` -- [ ] 2.3 Проверка группы: `make up` и сразу `make test-failover ACTION_SCRIPT=scripts/stop-one.sh`; проверка non-root на стенде и на контейнере от root +- [x] 2.3 Проверка группы: `make up` и сразу `make test-failover ACTION_SCRIPT=scripts/stop-one.sh`; проверка non-root на стенде и на контейнере от root ## 3. Обвязка доказательств