From 2c3d37958bb7b7a3fef39d651e376f68165085ed Mon Sep 17 00:00:00 2001 From: Roman Buryan Date: Wed, 28 Oct 2026 13:44:22 +0300 Subject: [PATCH] =?UTF-8?q?[DEPLOY]=20CT113=20=D0=B8=20CT134:=20observabil?= =?UTF-8?q?ity=20=D0=BF=D0=BE=D0=B4=20compose;=20=D0=B8=D1=81=D0=BF=D1=80?= =?UTF-8?q?=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD=D0=BE=20=D0=BF=D0=BE=D0=BB=D0=B5?= =?UTF-8?q?=20Config.Cmd=20=D0=B2=20=D0=B3=D0=B5=D0=BD=D0=B5=D1=80=D0=B0?= =?UTF-8?q?=D1=82=D0=BE=D1=80=D0=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- deploy/README.md | 9 +++++++++ deploy/ct113/docker-compose.yml | 5 ++++- deploy/ct134/docker-compose.yml | 21 +++++++++++++++++++-- ops/scripts/docker-to-compose.py | 12 ++++++++++-- 4 files changed, 42 insertions(+), 5 deletions(-) diff --git a/deploy/README.md b/deploy/README.md index c51d455..4d10b70 100644 --- a/deploy/README.md +++ b/deploy/README.md @@ -95,3 +95,12 @@ chmod +x /usr/local/lib/docker/cli-plugins/docker-compose Правило: сначала убедиться, что `docker compose version` работает, и только потом удалять контейнеры. + +## CT113: compose несовместим с dockerd (28.10.2026) + +`docker compose` в CT113 (клиент API 1.53) отказывается работать со старым +dockerd (максимум 1.41): `client version 1.53 is too new`. Поэтому `loki` там +запущен через `docker run` (аргумент `-config.file=/etc/loki/local-config.yaml`), +хотя описание лежит в `deploy/ct113/docker-compose.yml`. Привести к единому +виду можно двумя путями: обновить dockerd в CT113 либо поставить compose +версии, совместимой с API 1.41. diff --git a/deploy/ct113/docker-compose.yml b/deploy/ct113/docker-compose.yml index 7a75e99..c5c116f 100644 --- a/deploy/ct113/docker-compose.yml +++ b/deploy/ct113/docker-compose.yml @@ -30,6 +30,8 @@ services: SSL_CERT_FILE: "/etc/ssl/certs/ca-certificates.crt" entrypoint: - "/usr/bin/loki" + command: + - "-config.file=/etc/loki/local-config.yaml" oauth2-proxy-backup: image: "quay.io/oauth2-proxy/oauth2-proxy:latest" container_name: "oauth2-proxy-backup" @@ -63,9 +65,10 @@ services: restart: "unless-stopped" network_mode: "host" volumes: - - "/var/run/docker.sock:/var/run/docker.sock:ro" - "/opt/promtail-config.yml:/etc/promtail/config.yml:ro" - "/var/lib/docker/containers:/var/lib/docker/containers:ro" + - "/opt/promtail-positions:/var/lib/promtail" + - "/var/run/docker.sock:/var/run/docker.sock:ro" command: - "-config.file=/etc/promtail/config.yml" entrypoint: diff --git a/deploy/ct134/docker-compose.yml b/deploy/ct134/docker-compose.yml index 4b6ec4c..8c8f805 100644 --- a/deploy/ct134/docker-compose.yml +++ b/deploy/ct134/docker-compose.yml @@ -4,6 +4,10 @@ services: alertmanager: + user: "65534:65534" + command: + - "--config.file=/etc/alertmanager/alertmanager.yml" + - "--storage.path=/alertmanager" image: "prom/alertmanager:v0.27.0" container_name: "alertmanager" restart: "unless-stopped" @@ -26,6 +30,10 @@ services: LANG: "C.UTF-8" PYTHON_SHA256: "c2c4321961fab0fb999d66e0cecf521c2ab3994c7992873ea99e306c1094fd5a" PYTHON_VERSION: "3.12.15" + command: + - "python3" + - "-u" + - "/app/webhook.py" exportarr-bazarr: image: "ghcr.io/onedr0p/exportarr:latest" container_name: "exportarr-bazarr" @@ -42,6 +50,8 @@ services: - "/tini" - "--" - "/exportarr" + command: + - "bazarr" exportarr-prowlarr: image: "ghcr.io/onedr0p/exportarr:latest" container_name: "exportarr-prowlarr" @@ -58,6 +68,8 @@ services: - "/tini" - "--" - "/exportarr" + command: + - "prowlarr" exportarr-radarr: image: "ghcr.io/onedr0p/exportarr:latest" container_name: "exportarr-radarr" @@ -74,6 +86,8 @@ services: - "/tini" - "--" - "/exportarr" + command: + - "radarr" exportarr-sonarr: image: "ghcr.io/onedr0p/exportarr:latest" container_name: "exportarr-sonarr" @@ -90,6 +104,8 @@ services: - "/tini" - "--" - "/exportarr" + command: + - "sonarr" oauth2-proxy-prometheus: image: "quay.io/oauth2-proxy/oauth2-proxy:latest" container_name: "oauth2-proxy-prometheus" @@ -118,9 +134,10 @@ services: restart: "unless-stopped" network_mode: "host" volumes: - - "/var/lib/docker/containers:/var/lib/docker/containers:ro" - - "/var/run/docker.sock:/var/run/docker.sock:ro" - "/opt/promtail-config.yml:/etc/promtail/config.yml:ro" + - "/var/lib/docker/containers:/var/lib/docker/containers:ro" + - "/opt/promtail-positions:/var/lib/promtail" + - "/var/run/docker.sock:/var/run/docker.sock:ro" command: - "-config.file=/etc/promtail/config.yml" entrypoint: diff --git a/ops/scripts/docker-to-compose.py b/ops/scripts/docker-to-compose.py index 67033fb..5e1afae 100755 --- a/ops/scripts/docker-to-compose.py +++ b/ops/scripts/docker-to-compose.py @@ -105,8 +105,8 @@ def build(ct): if env: svc["environment"] = env - if cfg.get("Command"): - svc["command"] = cfg["Command"] + if cfg.get("Cmd"): + svc["command"] = cfg["Cmd"] elif "promtail" in cfg["Image"]: # promtail без явного -config.file берёт встроенный конфиг образа # (в нём нет clients) и падает: "at least one client config must be provided". @@ -182,6 +182,14 @@ def main(): for k in sorted(envfile): f.write(f"{k}=\n") print(f"CT{ct}: {len(services)} сервисов, {len(envfile)} секретов -> {d}/docker-compose.yml") + if "--env-out" in sys.argv: + envpath = f"/root/.env-out/ct{ct}.env" + os.makedirs("/root/.env-out", exist_ok=True) + with open(envpath, "w", encoding="utf-8") as f: + for k in sorted(envfile): + f.write(f'{k}="{envfile[k]}"\n') + os.chmod(envpath, 0o600) + print(f"CT{ct}: значения -> {envpath} (в Git не попадает)") else: print(body) return 0