[DEPLOY] CT110 и CT111 под compose; генератор сохраняет существующие тома
lint / hygiene (push) Successful in 16s

This commit is contained in:
root committed 2026-10-28 13:52:02 +03:00
1 parent a75af71407
commit 679e5fffbf
3 files changed
+29 -7

No files matched your search

+9 -3
View File
@@ -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
+11 -1
View File
@@ -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
+9 -3
View File
@@ -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):