fix: pin Tasker deploy runner compose project
This commit is contained in:
@@ -92,6 +92,7 @@ COMPONENTS = {
|
||||
"tasker": {
|
||||
"payload_root": Path("/volume1/docker/nodedc-platform/tasker"),
|
||||
"compose_root": Path("/volume1/docker/nodedc-platform/tasker/plane-app"),
|
||||
"compose_project": "nodedc-tasker",
|
||||
"compose_env_file": Path("/volume1/docker/nodedc-platform/tasker/plane-app/.env.synology"),
|
||||
"compose_files": (
|
||||
Path("/volume1/docker/nodedc-platform/tasker/plane-app/docker-compose.yaml"),
|
||||
@@ -778,7 +779,22 @@ def component_compose_root(component):
|
||||
return COMPONENTS[component].get("compose_root", component_root(component))
|
||||
|
||||
|
||||
def component_compose_project(component):
|
||||
return COMPONENTS[component].get("compose_project")
|
||||
|
||||
|
||||
def component_services(component, entries=None):
|
||||
if component == "tasker" and entries is not None:
|
||||
selected = ["api", "worker", "beat-worker", "web"]
|
||||
touches_compose = any(
|
||||
rel in ("plane-app/docker-compose.yaml", "plane-app/docker-compose.synology.override.yml")
|
||||
for rel in entries
|
||||
)
|
||||
touches_proxy = any(rel == "plane-src/apps/proxy/Caddyfile.ce" for rel in entries)
|
||||
if touches_compose or touches_proxy:
|
||||
selected.append("proxy")
|
||||
return tuple(selected)
|
||||
|
||||
if component == "platform" and entries is not None:
|
||||
selected = []
|
||||
|
||||
@@ -921,6 +937,9 @@ def plan_artifact(artifact):
|
||||
print(f"type={manifest['type']}")
|
||||
print(f"payload_root={root}")
|
||||
print(f"compose_root={compose_root}")
|
||||
compose_project = component_compose_project(component)
|
||||
if compose_project:
|
||||
print(f"compose_project={compose_project}")
|
||||
for build_root, build_args in builds:
|
||||
print(f"build_root={build_root}")
|
||||
print(f"build={' '.join((str(DOCKER),) + tuple(build_args))}")
|
||||
@@ -1037,6 +1056,9 @@ def run_build(component, entries=None):
|
||||
|
||||
def compose_base_cmd(component):
|
||||
cmd = [str(DOCKER), "compose"]
|
||||
compose_project = component_compose_project(component)
|
||||
if compose_project:
|
||||
cmd.extend(["-p", compose_project])
|
||||
env_file = component_compose_env_file(component)
|
||||
if env_file:
|
||||
cmd.extend(["--env-file", str(env_file)])
|
||||
|
||||
Reference in New Issue
Block a user