diff --git a/DEPLOY.md b/DEPLOY.md index 6f1bb70..9b5dc66 100644 --- a/DEPLOY.md +++ b/DEPLOY.md @@ -69,8 +69,8 @@ ClickHouse наружу **не публикуется**: только loopback make ch E=test # clickhouse-client контура # пример: события за сегодня по типам docker compose -p test --env-file env/test.env -f docker-compose.prod.yml exec -T clickhouse \ - clickhouse-client --user "$CLICKHOUSE_USER" --password "$CLICKHOUSE_PASSWORD" \ - --query "SELECT event_type, count() FROM analytics.events WHERE toDate(event_time) = today() GROUP BY event_type" + sh -lc 'clickhouse-client --user "$CLICKHOUSE_USER" --password "$CLICKHOUSE_PASSWORD" \ + --query "SELECT event_type, count() FROM analytics.events WHERE toDate(event_time) = today() GROUP BY event_type"' ``` Если ClickHouse недоступен, бот продолжает работать: события уходят в stdout (WARNING), diff --git a/README.md b/README.md index f6408c9..6be22f4 100644 --- a/README.md +++ b/README.md @@ -104,7 +104,7 @@ make backup E=test # ./scripts/clickhouse_backup.sh test ## Версионирование -- Единый источник версии — `common/version.py` (`__version__`), текущая — `0.3.5`. +- Единый источник версии — `common/version.py` (`__version__`), текущая — `0.3.6`. - Схема — SemVer-подобная (`MAJOR.MINOR.PATCH`); git-тег = `v` + версия (`v0.1`). - Docker-образы тегируются версией (Блок 2), события ClickHouse получают `bot_version` (Блок 3). - Выпуск: изменить `common/version.py` → коммит → аннотированный тег `vX.Y` → `git push --tags`. diff --git a/common/version.py b/common/version.py index cfd401a..6b552e8 100644 --- a/common/version.py +++ b/common/version.py @@ -7,4 +7,4 @@ from __future__ import annotations -__version__ = "0.3.5" +__version__ = "0.3.6" diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml index a898fa8..d05e7fc 100644 --- a/docker-compose.prod.yml +++ b/docker-compose.prod.yml @@ -85,11 +85,7 @@ services: soft: 262144 hard: 262144 healthcheck: - test: - - CMD-SHELL - - >- - clickhouse-client --user "$${CLICKHOUSE_USER}" --password "$${CLICKHOUSE_PASSWORD}" - --query "SELECT 1" > /dev/null || exit 1 + test: ["CMD-SHELL", "wget --spider -q -T 5 http://127.0.0.1:8123/ping || exit 1"] interval: 15s timeout: 10s retries: 10 diff --git a/docker-compose.yml b/docker-compose.yml index c3c788f..6a648ca 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -86,11 +86,7 @@ services: soft: 262144 hard: 262144 healthcheck: - test: - - CMD-SHELL - - >- - clickhouse-client --user "$${CLICKHOUSE_USER}" --password "$${CLICKHOUSE_PASSWORD}" - --query "SELECT 1" > /dev/null || exit 1 + test: ["CMD-SHELL", "wget --spider -q -T 5 http://127.0.0.1:8123/ping || exit 1"] interval: 15s timeout: 10s retries: 10 diff --git a/tests/test_version.py b/tests/test_version.py index 8a5bc2c..f84e902 100644 --- a/tests/test_version.py +++ b/tests/test_version.py @@ -7,4 +7,4 @@ from common import __version__ def test_version_is_set(): assert __version__ - assert __version__ == "0.3.5" + assert __version__ == "0.3.6"