From 679e5fffbf78481bf29b55ff4a9b13fe1faf4081 Mon Sep 17 00:00:00 2001 From: Roman Buryan Date: Wed, 28 Oct 2026 13:52:02 +0300 Subject: [PATCH] =?UTF-8?q?[DEPLOY]=20CT110=20=D0=B8=20CT111=20=D0=BF?= =?UTF-8?q?=D0=BE=D0=B4=20compose;=20=D0=B3=D0=B5=D0=BD=D0=B5=D1=80=D0=B0?= =?UTF-8?q?=D1=82=D0=BE=D1=80=20=D1=81=D0=BE=D1=85=D1=80=D0=B0=D0=BD=D1=8F?= =?UTF-8?q?=D0=B5=D1=82=20=D1=81=D1=83=D1=89=D0=B5=D1=81=D1=82=D0=B2=D1=83?= =?UTF-8?q?=D1=8E=D1=89=D0=B8=D0=B5=20=D1=82=D0=BE=D0=BC=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- deploy/ct110/docker-compose.yml | 12 +++++++++--- deploy/ct111/docker-compose.yml | 12 +++++++++++- ops/scripts/docker-to-compose.py | 12 +++++++++--- 3 files changed, 29 insertions(+), 7 deletions(-) diff --git a/deploy/ct110/docker-compose.yml b/deploy/ct110/docker-compose.yml index 11c2da6..a0ecc78 100644 --- a/deploy/ct110/docker-compose.yml +++ b/deploy/ct110/docker-compose.yml @@ -9,7 +9,7 @@ services: restart: "unless-stopped" network_mode: "host" volumes: - - "beszel-agent-var-lib-beszel-agent:/var/lib/beszel-agent" + - "a96f654f0260e2ae6d63645b081ccb96c46d6fad265e8e09625ff89f10cd6577:/var/lib/beszel-agent" - "/var/run/docker.sock:/var/run/docker.sock:ro" environment: HUB_URL: "http://192.168.1.110:8092" @@ -120,6 +120,8 @@ services: TRUSTED_PROXIES: "**" TZ: "Europe/Moscow" VERSION: "v6.6.6" + command: + - "/init" entrypoint: - "docker-php-serversideup-entrypoint" grocy: @@ -172,6 +174,8 @@ services: HBOX_STORAGE_SQLITE_URL: "/data/homebox.db?_pragma=busy_timeout(5000)" HBOX_WEB_MAX_UPLOAD_SIZE: "20" TZ: "Europe/Moscow" + command: + - "/data/config.yml" entrypoint: - "/app/api" mealie: @@ -299,6 +303,7 @@ 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" @@ -311,9 +316,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" @@ -331,7 +336,8 @@ services: entrypoint: - "/app/vikunja/vikunja" volumes: - beszel-agent-var-lib-beszel-agent: {} + a96f654f0260e2ae6d63645b081ccb96c46d6fad265e8e09625ff89f10cd6577: + external: true networks: lifestyle-lxc_lifestyle_net: external: true diff --git a/deploy/ct111/docker-compose.yml b/deploy/ct111/docker-compose.yml index e19391f..5a44287 100644 --- a/deploy/ct111/docker-compose.yml +++ b/deploy/ct111/docker-compose.yml @@ -25,6 +25,9 @@ services: PYTHON_VERSION: "3.12.15" USERBOT_URL: "http://192.168.1.10:9122" VPN_PROXY: "http://192.168.1.161:7890" + command: + - "python3" + - "/app/book_bot.py" calibre-web: image: "crocodilestick/calibre-web-automated:latest" container_name: "calibre-web" @@ -70,6 +73,9 @@ services: PREFIX: "/catalog" PYTHON_SHA256: "c2c4321961fab0fb999d66e0cecf521c2ab3994c7992873ea99e306c1094fd5a" PYTHON_VERSION: "3.12.15" + command: + - "python3" + - "/app/catalog_app.py" duplicati: image: "duplicati/duplicati:latest" container_name: "duplicati" @@ -87,6 +93,8 @@ services: DUPLICATI__WEBSERVICE_PASSWORD: ${DUPLICATI_DUPLICATI__WEBSERVICE_PASSWORD} DUPLICATI__WEBSERVICE_PORT: "8200" XDG_CONFIG_HOME: "/data" + command: + - "duplicati-server" entrypoint: - "/usr/bin/tini" - "--" @@ -203,10 +211,12 @@ 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" volumes: - lidarr-config: {} + lidarr-config: + external: true diff --git a/ops/scripts/docker-to-compose.py b/ops/scripts/docker-to-compose.py index 5e1afae..9d9e137 100755 --- a/ops/scripts/docker-to-compose.py +++ b/ops/scripts/docker-to-compose.py @@ -83,8 +83,10 @@ def build(ct): if m.get("Type") == "bind": vols.append(f'{m["Source"]}:{m["Destination"]}' + (":ro" if not m.get("RW", True) else "")) elif m.get("Type") == "volume": - vname = f'{name}-{m["Destination"].strip("/").replace("/", "-")}' - volumes[vname] = {} + # сохраняем существующий том как есть (external), иначе + # compose создаст новый пустой и данные пропадут + vname = m.get("Name") or f'{name}-{m["Destination"].strip("/").replace("/", "-")}' + volumes[vname] = {"external": True} if m.get("Name") else {} vols.append(f'{vname}:{m["Destination"]}') if vols: svc["volumes"] = vols @@ -151,7 +153,11 @@ def yaml_dump(services, volumes, networks): if volumes: L.append("volumes:") for v in sorted(volumes): - L.append(f" {v}: {{}}") + if volumes[v] == {"external": True}: + L.append(f" {v}:") + L.append(" external: true") + else: + L.append(f" {v}: {{}}") if networks: L.append("networks:") for n in sorted(networks):