From 0369a18c6e0ad56075b04d67ce46d3e5caaed9f7 Mon Sep 17 00:00:00 2001 From: decentral1se Date: Sat, 3 Apr 2021 20:18:31 +0200 Subject: [PATCH] Fix service version collection Closes https://git.autonomic.zone/coop-cloud/abra/issues/128. --- bin/app-json.py | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/bin/app-json.py b/bin/app-json.py index a235e40..27d31e5 100755 --- a/bin/app-json.py +++ b/bin/app-json.py @@ -159,7 +159,7 @@ def get_app_versions(app_path): services_cmd = "yq e '.services | keys | .[]' compose*.yml" services = _run_cmd(services_cmd, shell=True).split() - service_versions = [] + service_versions = {} for service in services: services_cmd = f"yq e '.services.{service}.image' compose*.yml" images = _run_cmd(services_cmd, shell=True).split() @@ -172,15 +172,13 @@ def get_app_versions(app_path): output = _run_cmd(images_cmd, shell=True) service_version_info = { - service: { - "image": image.split(":")[0], - "tag": image.split(":")[-1], - "digest": output.split(":")[-1][:8], - } + "image": image.split(":")[0], + "tag": image.split(":")[-1], + "digest": output.split(":")[-1][:8], } log.info(f"Parsed {service_version_info}") - service_versions.append(service_version_info) + service_versions[service] = service_version_info versions[tag] = service_versions