From 11a2d08e4c864699384cba7493a20601902282f8 Mon Sep 17 00:00:00 2001
From: Jiri Uhlir <jiri.uhlir59@gmail.com>
Date: Wed, 3 Jun 2026 10:49:34 +0200
Subject: [PATCH] Generate app ports in catalog and gateway

---
 scripts/generate-caddyfile.sh | 44 ++++++++++++++++++++++++++++-------
 scripts/generate-catalog.sh   | 31 +++++++++++++++++++++---
 2 files changed, 63 insertions(+), 12 deletions(-)

diff --git a/scripts/generate-caddyfile.sh b/scripts/generate-caddyfile.sh
index 99f302e..32b3aef 100755
--- a/scripts/generate-caddyfile.sh
+++ b/scripts/generate-caddyfile.sh
@@ -29,16 +29,42 @@ cat > "$CADDY_FILE" <<EOF_CADDY
 EOF_CADDY
 
 if [ -f "$CATALOG_FILE" ]; then
-    awk '
-    /^[[:space:]]*-[[:space:]]id:/ {
-        app=$3
+    python3 - "$CATALOG_FILE" "$CADDY_FILE" <<'PY'
+import sys
 
-        print "    handle_path /apps/" app "/* {"
-        print "        reverse_proxy " app ":8000"
-        print "    }"
-        print ""
-    }
-    ' "$CATALOG_FILE" >> "$CADDY_FILE"
+catalog_file = sys.argv[1]
+caddy_file = sys.argv[2]
+
+apps = []
+current = None
+
+with open(catalog_file, "r", encoding="utf-8") as f:
+    for raw in f:
+        stripped = raw.strip()
+
+        if stripped.startswith("- id:"):
+            if current:
+                apps.append(current)
+            current = {"id": stripped.split(":", 1)[1].strip()}
+        elif current and ":" in stripped:
+            key, value = stripped.split(":", 1)
+            current[key.strip()] = value.strip().strip('"')
+
+if current:
+    apps.append(current)
+
+with open(caddy_file, "a", encoding="utf-8") as f:
+    for app in apps:
+        app_id = app.get("id")
+        port = app.get("container_port") or app.get("port") or "8000"
+
+        if not app_id:
+            continue
+
+        f.write(f"    handle_path /apps/{app_id}/* {{\n")
+        f.write(f"        reverse_proxy {app_id}:{port}\n")
+        f.write("    }\n\n")
+PY
 fi
 
 cat >> "$CADDY_FILE" <<EOF_CADDY
diff --git a/scripts/generate-catalog.sh b/scripts/generate-catalog.sh
index 8487cb0..890943b 100755
--- a/scripts/generate-catalog.sh
+++ b/scripts/generate-catalog.sh
@@ -24,24 +24,49 @@ SELECT
     version,
     status,
     COALESCE(memory, ''),
-    COALESCE(cpus, '')
+    COALESCE(cpus, ''),
+    COALESCE(container_port, 8000),
+    COALESCE(health_url, '/health'),
+    COALESCE(runtime, ''),
+    COALESCE(template, '')
 FROM apps
+WHERE is_enabled = 1
 ORDER BY id
 """).fetchall()
 
 lines = ["apps:"]
 
 for row in rows:
-    app_id, name, language, version, status, memory, cpus = row
+    (
+        app_id,
+        name,
+        language,
+        version,
+        status,
+        memory,
+        cpus,
+        container_port,
+        health_url,
+        runtime,
+        template,
+    ) = row
+
+    if not str(health_url).startswith("/"):
+        health_path = "/health"
+    else:
+        health_path = health_url
 
     lines.append("")
     lines.append(f"  - id: {app_id}")
     lines.append(f"    name: {name}")
     lines.append(f"    language: {language}")
+    lines.append(f"    runtime: {runtime}")
+    lines.append(f"    template: {template}")
     lines.append(f"    version: {version}")
+    lines.append(f"    container_port: {container_port}")
     lines.append(f"    base_path: /apps/{app_id}")
     lines.append(f"    docs: /apps/{app_id}/docs")
-    lines.append(f"    health: /apps/{app_id}/health")
+    lines.append(f"    health: /apps/{app_id}{health_path}")
     lines.append(f"    status: {status}")
 
     if memory: