From 1b476e2dd8619e60143002cc1775bef7ab3f9e65 Mon Sep 17 00:00:00 2001 From: Roman Buryan Date: Wed, 28 Oct 2026 13:18:33 +0300 Subject: [PATCH] =?UTF-8?q?[DEPLOY]=20CT103:=20promtail=20=D0=BF=D0=BE?= =?UTF-8?q?=D0=B4=20compose,=20=D0=BF=D0=BE=D1=81=D1=82=D0=BE=D1=8F=D0=BD?= =?UTF-8?q?=D0=BD=D1=8B=D0=B5=20=D0=BF=D0=BE=D0=B7=D0=B8=D1=86=D0=B8=D0=B8?= =?UTF-8?q?;=20=D0=BF=D1=80=D0=B5=D0=B4=D0=BE=D1=85=D1=80=D0=B0=D0=BD?= =?UTF-8?q?=D0=B8=D1=82=D0=B5=D0=BB=D1=8C=20=D0=B2=20=D0=B3=D0=B5=D0=BD?= =?UTF-8?q?=D0=B5=D1=80=D0=B0=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 | 15 +++++++++++++++ deploy/ct101/docker-compose.yml | 4 +++- deploy/ct102/docker-compose.yml | 2 ++ deploy/ct103/docker-compose.yml | 10 +++++++--- deploy/ct105/docker-compose.yml | 2 ++ deploy/ct106/docker-compose.yml | 4 +++- deploy/ct107/docker-compose.yml | 4 +++- deploy/ct108/docker-compose.yml | 4 +++- deploy/ct109/docker-compose.yml | 4 +++- deploy/ct110/docker-compose.yml | 4 +++- deploy/ct111/docker-compose.yml | 4 +++- deploy/ct113/docker-compose.yml | 4 +++- deploy/ct114/docker-compose.yml | 4 +++- deploy/ct115/docker-compose.yml | 6 ++++-- deploy/ct116/docker-compose.yml | 4 +++- deploy/ct117/docker-compose.yml | 4 +++- deploy/ct118/docker-compose.yml | 4 +++- deploy/ct119/docker-compose.yml | 2 ++ deploy/ct120/docker-compose.yml | 4 +++- deploy/ct121/docker-compose.yml | 2 ++ deploy/ct125/docker-compose.yml | 4 +++- deploy/ct127/docker-compose.yml | 4 +++- deploy/ct134/docker-compose.yml | 4 +++- deploy/ct139/docker-compose.yml | 4 +++- deploy/ct155/docker-compose.yml | 2 ++ ops/scripts/docker-to-compose.py | 8 ++++++++ 26 files changed, 95 insertions(+), 22 deletions(-) diff --git a/deploy/README.md b/deploy/README.md index 6eb48a3..8b84ff3 100644 --- a/deploy/README.md +++ b/deploy/README.md @@ -35,3 +35,18 @@ docker compose up -d * У `gitea-runner` дополнительно `CONFIG_FILE=/data/config.yaml` — без этой переменной `run.sh` не передаёт `--config`, и опция `container.options` (нужная, чтобы job-контейнеры стартовали) молча игнорируется. + +## Ловушки, пойманные при переносе (28.10.2026) + +* **promtail без `-config.file`** читает встроенный конфиг образа — в нём нет + `clients`, и контейнер падает: `at least one client config must be provided`. + Поэтому в compose у promtail всегда есть + `command: ["-config.file=/etc/promtail/config.yml"]`. +* **Позиции promtail нельзя держать в `/tmp`**: при пересоздании контейнера они + теряются, promtail начинает перечитывать старые логи, а Loki отбрасывает их + (`timestamp too old`) — поток ошибок в логе. Позиции вынесены на хост: + `/opt/promtail-positions:/var/lib/promtail`. +* **Генератор читает живое состояние.** Если в момент генерации в контейнере + висит временный контейнер (например, тестовый), он попадёт в файл. Поэтому + `docker-to-compose.py` без `--force` не перезаписывает существующий + `deploy/ctNNN/docker-compose.yml`. diff --git a/deploy/ct101/docker-compose.yml b/deploy/ct101/docker-compose.yml index d26e235..24f4b3b 100644 --- a/deploy/ct101/docker-compose.yml +++ b/deploy/ct101/docker-compose.yml @@ -9,8 +9,10 @@ services: restart: "unless-stopped" network_mode: "host" volumes: - - "/opt/promtail-config.yml:/etc/promtail/config.yml:ro" - "/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" + command: + - "-config.file=/etc/promtail/config.yml" entrypoint: - "/usr/bin/promtail" diff --git a/deploy/ct102/docker-compose.yml b/deploy/ct102/docker-compose.yml index 8a533f4..aa944c2 100644 --- a/deploy/ct102/docker-compose.yml +++ b/deploy/ct102/docker-compose.yml @@ -36,5 +36,7 @@ services: - "/opt/promtail-config.yml:/etc/promtail/config.yml:ro" - "/var/lib/docker/containers:/var/lib/docker/containers:ro" - "/var/run/docker.sock:/var/run/docker.sock:ro" + command: + - "-config.file=/etc/promtail/config.yml" entrypoint: - "/usr/bin/promtail" diff --git a/deploy/ct103/docker-compose.yml b/deploy/ct103/docker-compose.yml index d26e235..0ccac12 100644 --- a/deploy/ct103/docker-compose.yml +++ b/deploy/ct103/docker-compose.yml @@ -1,6 +1,7 @@ -# Сгенерировано docker-to-compose.py по живому состоянию. -# Секреты — в .env рядом (права 600, в Git не попадает). -# Проверка: docker compose config +# CT103 — promtail (сбор логов Docker в Loki). +# Собран по живому состоянию 28.10.2026. +# ВАЖНО: без явного -config.file promtail берёт встроенный конфиг образа +# (в нём нет clients) и падает: "at least one client config must be provided". services: promtail: @@ -11,6 +12,9 @@ services: volumes: - "/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: - "/usr/bin/promtail" diff --git a/deploy/ct105/docker-compose.yml b/deploy/ct105/docker-compose.yml index d26e235..1bbc559 100644 --- a/deploy/ct105/docker-compose.yml +++ b/deploy/ct105/docker-compose.yml @@ -12,5 +12,7 @@ services: - "/opt/promtail-config.yml:/etc/promtail/config.yml:ro" - "/var/lib/docker/containers:/var/lib/docker/containers:ro" - "/var/run/docker.sock:/var/run/docker.sock:ro" + command: + - "-config.file=/etc/promtail/config.yml" entrypoint: - "/usr/bin/promtail" diff --git a/deploy/ct106/docker-compose.yml b/deploy/ct106/docker-compose.yml index df8146a..e6b5257 100644 --- a/deploy/ct106/docker-compose.yml +++ b/deploy/ct106/docker-compose.yml @@ -79,9 +79,11 @@ services: restart: "unless-stopped" network_mode: "host" volumes: - - "/opt/promtail-config.yml:/etc/promtail/config.yml:ro" - "/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" + command: + - "-config.file=/etc/promtail/config.yml" entrypoint: - "/usr/bin/promtail" networks: diff --git a/deploy/ct107/docker-compose.yml b/deploy/ct107/docker-compose.yml index 845f344..60bc48a 100644 --- a/deploy/ct107/docker-compose.yml +++ b/deploy/ct107/docker-compose.yml @@ -9,9 +9,9 @@ services: restart: "unless-stopped" network_mode: "host" volumes: - - "/opt/network-lxc/mosquitto/log:/mosquitto/log" - "/opt/network-lxc/mosquitto/config:/mosquitto/config" - "/opt/network-lxc/mosquitto/data:/mosquitto/data" + - "/opt/network-lxc/mosquitto/log:/mosquitto/log" environment: DOWNLOAD_SHA256: "fd905380691ac65ea5a93779e8214941829e3d6e038d5edff9eac5fd74cbed02" GPG_KEYS: "A0D6EEA1DCAE49A635A3B2F0779B22DFB3E717B7" @@ -51,5 +51,7 @@ services: - "/opt/promtail-config.yml:/etc/promtail/config.yml:ro" - "/var/lib/docker/containers:/var/lib/docker/containers:ro" - "/var/run/docker.sock:/var/run/docker.sock:ro" + command: + - "-config.file=/etc/promtail/config.yml" entrypoint: - "/usr/bin/promtail" diff --git a/deploy/ct108/docker-compose.yml b/deploy/ct108/docker-compose.yml index 71117c8..ccb322f 100644 --- a/deploy/ct108/docker-compose.yml +++ b/deploy/ct108/docker-compose.yml @@ -95,9 +95,11 @@ 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" + - "/var/run/docker.sock:/var/run/docker.sock:ro" + command: + - "-config.file=/etc/promtail/config.yml" entrypoint: - "/usr/bin/promtail" networks: diff --git a/deploy/ct109/docker-compose.yml b/deploy/ct109/docker-compose.yml index d26e235..d5a41d5 100644 --- a/deploy/ct109/docker-compose.yml +++ b/deploy/ct109/docker-compose.yml @@ -9,8 +9,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" - - "/var/run/docker.sock:/var/run/docker.sock:ro" + command: + - "-config.file=/etc/promtail/config.yml" entrypoint: - "/usr/bin/promtail" diff --git a/deploy/ct110/docker-compose.yml b/deploy/ct110/docker-compose.yml index bd33556..11c2da6 100644 --- a/deploy/ct110/docker-compose.yml +++ b/deploy/ct110/docker-compose.yml @@ -300,6 +300,8 @@ services: - "/opt/promtail-config.yml:/etc/promtail/config.yml:ro" - "/var/lib/docker/containers:/var/lib/docker/containers:ro" - "/var/run/docker.sock:/var/run/docker.sock:ro" + command: + - "-config.file=/etc/promtail/config.yml" entrypoint: - "/usr/bin/promtail" vikunja: @@ -309,9 +311,9 @@ services: ports: - "9285:3456" volumes: - - "/opt/lifestyle-lxc/vikunja/config.yml:/app/vikunja/config.yml" - "/opt/lifestyle-lxc/vikunja/files:/app/vikunja/files" - "/opt/lifestyle-lxc/vikunja/db:/db" + - "/opt/lifestyle-lxc/vikunja/config.yml:/app/vikunja/config.yml" environment: TZ: "Europe/Moscow" VIKUNJA_AUTH_OPENID_ENABLED: "true" diff --git a/deploy/ct111/docker-compose.yml b/deploy/ct111/docker-compose.yml index f73ce3a..e19391f 100644 --- a/deploy/ct111/docker-compose.yml +++ b/deploy/ct111/docker-compose.yml @@ -77,9 +77,9 @@ services: ports: - "8200:8200" volumes: - - "/root:/source/root:ro" - "/var/backups/duplicati:/data" - "/etc:/source/etc:ro" + - "/root:/source/root:ro" environment: DUPLICATI_CHANNEL: "stable" DUPLICATI_VERSION: "2.4.0.0" @@ -204,6 +204,8 @@ services: - "/opt/promtail-config.yml:/etc/promtail/config.yml:ro" - "/var/lib/docker/containers:/var/lib/docker/containers:ro" - "/var/run/docker.sock:/var/run/docker.sock:ro" + command: + - "-config.file=/etc/promtail/config.yml" entrypoint: - "/usr/bin/promtail" volumes: diff --git a/deploy/ct113/docker-compose.yml b/deploy/ct113/docker-compose.yml index 88b0871..7a75e99 100644 --- a/deploy/ct113/docker-compose.yml +++ b/deploy/ct113/docker-compose.yml @@ -63,9 +63,11 @@ 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" - - "/var/run/docker.sock:/var/run/docker.sock:ro" + command: + - "-config.file=/etc/promtail/config.yml" entrypoint: - "/usr/bin/promtail" volumes: diff --git a/deploy/ct114/docker-compose.yml b/deploy/ct114/docker-compose.yml index d26e235..d5a41d5 100644 --- a/deploy/ct114/docker-compose.yml +++ b/deploy/ct114/docker-compose.yml @@ -9,8 +9,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" - - "/var/run/docker.sock:/var/run/docker.sock:ro" + command: + - "-config.file=/etc/promtail/config.yml" entrypoint: - "/usr/bin/promtail" diff --git a/deploy/ct115/docker-compose.yml b/deploy/ct115/docker-compose.yml index b371033..f56d8fd 100644 --- a/deploy/ct115/docker-compose.yml +++ b/deploy/ct115/docker-compose.yml @@ -11,8 +11,8 @@ services: security_opt: - "apparmor=unconfined" volumes: - - "beszel-agent-var-lib-beszel-agent:/var/lib/beszel-agent" - "/var/run/docker.sock:/var/run/docker.sock:ro" + - "beszel-agent-var-lib-beszel-agent:/var/lib/beszel-agent" environment: HUB_URL: "http://192.168.1.110:8092" KEY: ${BESZEL_AGENT_KEY} @@ -73,9 +73,11 @@ services: security_opt: - "apparmor=unconfined" volumes: + - "/opt/promtail-config.yml:/etc/promtail/config.yml:ro" - "/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" + command: + - "-config.file=/etc/promtail/config.yml" entrypoint: - "/usr/bin/promtail" volumes: diff --git a/deploy/ct116/docker-compose.yml b/deploy/ct116/docker-compose.yml index d26e235..24f4b3b 100644 --- a/deploy/ct116/docker-compose.yml +++ b/deploy/ct116/docker-compose.yml @@ -9,8 +9,10 @@ services: restart: "unless-stopped" network_mode: "host" volumes: - - "/opt/promtail-config.yml:/etc/promtail/config.yml:ro" - "/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" + command: + - "-config.file=/etc/promtail/config.yml" entrypoint: - "/usr/bin/promtail" diff --git a/deploy/ct117/docker-compose.yml b/deploy/ct117/docker-compose.yml index d165b5f..9c5eb90 100644 --- a/deploy/ct117/docker-compose.yml +++ b/deploy/ct117/docker-compose.yml @@ -35,8 +35,10 @@ services: restart: "unless-stopped" network_mode: "host" volumes: - - "/opt/promtail-config.yml:/etc/promtail/config.yml:ro" - "/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" + command: + - "-config.file=/etc/promtail/config.yml" entrypoint: - "/usr/bin/promtail" diff --git a/deploy/ct118/docker-compose.yml b/deploy/ct118/docker-compose.yml index d883d31..6511593 100644 --- a/deploy/ct118/docker-compose.yml +++ b/deploy/ct118/docker-compose.yml @@ -35,8 +35,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" - - "/var/run/docker.sock:/var/run/docker.sock:ro" + command: + - "-config.file=/etc/promtail/config.yml" entrypoint: - "/usr/bin/promtail" diff --git a/deploy/ct119/docker-compose.yml b/deploy/ct119/docker-compose.yml index d784c38..b24c2e9 100644 --- a/deploy/ct119/docker-compose.yml +++ b/deploy/ct119/docker-compose.yml @@ -38,5 +38,7 @@ services: - "/opt/promtail-config.yml:/etc/promtail/config.yml:ro" - "/var/lib/docker/containers:/var/lib/docker/containers:ro" - "/var/run/docker.sock:/var/run/docker.sock:ro" + command: + - "-config.file=/etc/promtail/config.yml" entrypoint: - "/usr/bin/promtail" diff --git a/deploy/ct120/docker-compose.yml b/deploy/ct120/docker-compose.yml index 2ebeb9d..b5fdd11 100644 --- a/deploy/ct120/docker-compose.yml +++ b/deploy/ct120/docker-compose.yml @@ -35,8 +35,10 @@ services: restart: "unless-stopped" network_mode: "host" volumes: + - "/opt/promtail-config.yml:/etc/promtail/config.yml:ro" - "/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" + command: + - "-config.file=/etc/promtail/config.yml" entrypoint: - "/usr/bin/promtail" diff --git a/deploy/ct121/docker-compose.yml b/deploy/ct121/docker-compose.yml index d26e235..1bbc559 100644 --- a/deploy/ct121/docker-compose.yml +++ b/deploy/ct121/docker-compose.yml @@ -12,5 +12,7 @@ services: - "/opt/promtail-config.yml:/etc/promtail/config.yml:ro" - "/var/lib/docker/containers:/var/lib/docker/containers:ro" - "/var/run/docker.sock:/var/run/docker.sock:ro" + command: + - "-config.file=/etc/promtail/config.yml" entrypoint: - "/usr/bin/promtail" diff --git a/deploy/ct125/docker-compose.yml b/deploy/ct125/docker-compose.yml index 1e458be..10857ca 100644 --- a/deploy/ct125/docker-compose.yml +++ b/deploy/ct125/docker-compose.yml @@ -9,8 +9,8 @@ services: restart: "unless-stopped" network_mode: "host" volumes: - - "/music:/music" - "navidrome-data:/data" + - "/music:/music" environment: ND_CONFIGFILE: "/data/navidrome.toml" ND_DATAFOLDER: "/data" @@ -59,6 +59,8 @@ services: - "/opt/promtail-config.yml:/etc/promtail/config.yml:ro" - "/var/lib/docker/containers:/var/lib/docker/containers:ro" - "/var/run/docker.sock:/var/run/docker.sock:ro" + command: + - "-config.file=/etc/promtail/config.yml" entrypoint: - "/usr/bin/promtail" volumes: diff --git a/deploy/ct127/docker-compose.yml b/deploy/ct127/docker-compose.yml index 1413574..7d26a46 100644 --- a/deploy/ct127/docker-compose.yml +++ b/deploy/ct127/docker-compose.yml @@ -33,8 +33,10 @@ services: restart: "unless-stopped" network_mode: "host" volumes: - - "/opt/promtail-config.yml:/etc/promtail/config.yml:ro" - "/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" + command: + - "-config.file=/etc/promtail/config.yml" entrypoint: - "/usr/bin/promtail" diff --git a/deploy/ct134/docker-compose.yml b/deploy/ct134/docker-compose.yml index 781c2e0..4b6ec4c 100644 --- a/deploy/ct134/docker-compose.yml +++ b/deploy/ct134/docker-compose.yml @@ -118,8 +118,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" + command: + - "-config.file=/etc/promtail/config.yml" entrypoint: - "/usr/bin/promtail" diff --git a/deploy/ct139/docker-compose.yml b/deploy/ct139/docker-compose.yml index e6b77b4..1bbc559 100644 --- a/deploy/ct139/docker-compose.yml +++ b/deploy/ct139/docker-compose.yml @@ -9,8 +9,10 @@ services: restart: "unless-stopped" network_mode: "host" volumes: + - "/opt/promtail-config.yml:/etc/promtail/config.yml:ro" - "/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" + command: + - "-config.file=/etc/promtail/config.yml" entrypoint: - "/usr/bin/promtail" diff --git a/deploy/ct155/docker-compose.yml b/deploy/ct155/docker-compose.yml index 800eda7..f23f5fa 100644 --- a/deploy/ct155/docker-compose.yml +++ b/deploy/ct155/docker-compose.yml @@ -69,6 +69,8 @@ services: - "/opt/promtail-config.yml:/etc/promtail/config.yml:ro" - "/var/lib/docker/containers:/var/lib/docker/containers:ro" - "/var/run/docker.sock:/var/run/docker.sock:ro" + command: + - "-config.file=/etc/promtail/config.yml" entrypoint: - "/usr/bin/promtail" volumes: diff --git a/ops/scripts/docker-to-compose.py b/ops/scripts/docker-to-compose.py index 27e77b3..67033fb 100755 --- a/ops/scripts/docker-to-compose.py +++ b/ops/scripts/docker-to-compose.py @@ -107,6 +107,11 @@ def build(ct): if cfg.get("Command"): svc["command"] = cfg["Command"] + elif "promtail" in cfg["Image"]: + # promtail без явного -config.file берёт встроенный конфиг образа + # (в нём нет clients) и падает: "at least one client config must be provided". + # Проверено 28.10.2026 на CT103. + svc["command"] = ["-config.file=/etc/promtail/config.yml"] if cfg.get("Entrypoint"): svc["entrypoint"] = cfg["Entrypoint"] for n in svc.get("networks", []): @@ -168,6 +173,9 @@ def main(): if write: d = f"{REPO}/deploy/ct{ct}" os.makedirs(d, exist_ok=True) + if os.path.exists(f"{d}/docker-compose.yml") and "--force" not in sys.argv: + print(f"CT{ct}: файл уже есть, не перезаписываю (--force чтобы обновить)", file=sys.stderr) + return 0 open(f"{d}/docker-compose.yml", "w", encoding="utf-8").write(body) with open(f"{d}/env.example", "w", encoding="utf-8") as f: f.write("# Скопировать в .env на CT%s, chmod 600\n" % ct)