From 8a54fa3f27bb26ac280e534e09c4804ee8c96447 Mon Sep 17 00:00:00 2001
From: decentral1se <hi@decentral1.se>
Date: Fri, 2 Apr 2021 16:54:40 +0200
Subject: [PATCH] Only gather image names and fix generator

---
 bin/app-json.py                                      | 9 +++++++--
 deploy/abra-apps.cloud.autonomic.zone/abra-apps.json | 4 ++--
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/bin/app-json.py b/bin/app-json.py
index 0ccdc55..236c9e4 100755
--- a/bin/app-json.py
+++ b/bin/app-json.py
@@ -118,7 +118,11 @@ def get_app_versions(app_path, tag):
             digest_command = f"skopeo inspect docker://{image} | jq '.Digest'"
             output = check_output(digest_command, shell=True).decode("utf-8")
             digest = output.strip().split(":")[-1][:8]
-            versions.append({service: {"image": image, "tag": tag, "digest": digest}})
+
+            image_name = image.split(":")[0]
+            versions.append(
+                {service: {"image": image_name, "tag": tag, "digest": digest}}
+            )
 
     run(f"git checkout HEAD", shell=True)
     return versions
@@ -126,7 +130,8 @@ def get_app_versions(app_path, tag):
 
 clone_apps()
 
-target = f"{SCRIPT_PATH}/../deploy/abra-apps.autonomic.zone/abra-apps.json"
+target = f"{SCRIPT_PATH}/../deploy/abra-apps.cloud.autonomic.zone/abra-apps.json"
+
 with open(target, "w", encoding="utf-8") as handle:
     dump(gen_apps_json(), handle, ensure_ascii=False, indent=4)
 
diff --git a/deploy/abra-apps.cloud.autonomic.zone/abra-apps.json b/deploy/abra-apps.cloud.autonomic.zone/abra-apps.json
index f4ef5e0..a91994b 100644
--- a/deploy/abra-apps.cloud.autonomic.zone/abra-apps.json
+++ b/deploy/abra-apps.cloud.autonomic.zone/abra-apps.json
@@ -19,14 +19,14 @@
         "versions": [
             {
                 "app": {
-                    "image": "gitea/gitea:1.13.6",
+                    "image": "gitea/gitea",
                     "tag": "1.13.6",
                     "digest": "1d90f984"
                 }
             },
             {
                 "db": {
-                    "image": "mariadb:10.5",
+                    "image": "mariadb",
                     "tag": "1.13.6",
                     "digest": "ab7c906b"
                 }