[DEPLOY] CT103: promtail под compose, постоянные позиции; предохранитель в генераторе
lint / hygiene (push) Successful in 15s

This commit is contained in:
root committed 2026-10-28 13:18:33 +03:00
1 parent 4622c02040
commit 1b476e2dd8
26 files changed
+95 -22

No files matched your search

+15
View File
@@ -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`.
+3 -1
View File
@@ -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"
+2
View File
@@ -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"
+7 -3
View File
@@ -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"
+2
View File
@@ -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"
+3 -1
View File
@@ -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:
+3 -1
View File
@@ -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"
+3 -1
View File
@@ -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:
+3 -1
View File
@@ -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"
+3 -1
View File
@@ -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"
+3 -1
View File
@@ -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:
+3 -1
View File
@@ -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:
+3 -1
View File
@@ -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"
+4 -2
View File
@@ -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:
+3 -1
View File
@@ -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"
+3 -1
View File
@@ -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"
+3 -1
View File
@@ -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"
+2
View File
@@ -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"
+3 -1
View File
@@ -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"
+2
View File
@@ -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"
+3 -1
View File
@@ -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:
+3 -1
View File
@@ -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"
+3 -1
View File
@@ -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"
+3 -1
View File
@@ -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"
+2
View File
@@ -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:
+8
View File
@@ -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)