@tdk-landscape/tdk-cli-core 1.3.79 → 1.3.81

package/cli/dist/utils/service-urls.js

@@ -15,22 +15,24 @@ export function getProjectName() {
     }
     return "tdk-project";
 }
-export function resolveSubdomainBases() {
+export function resolveSubdomainBases(ingressPort) {
     const projectName = getProjectName();
-    const raw = process.env.TDK_SERVICE_BASE_URL ?? `http://${projectName}.localhost`;
+    const raw = process.env.TDK_SERVICE_BASE_URL ??
+        `http://${projectName}.localhost${ingressPort ? `:${ingressPort}` : ""}`;
     try {
         const u = new URL(raw.includes("://") ? raw : `http://${raw}`);
         const host = u.hostname;
+        const port = u.port || (ingressPort ? String(ingressPort) : "");
         if (host === "localhost" || /^\d+\.\d+\.\d+\.\d+$/.test(host)) {
             return {
-                appBase: `${u.protocol}//${host}${u.port ? `:${u.port}` : ""}`,
-                apiBase: `${u.protocol}//${host}${u.port ? `:${u.port}` : ""}`,
+                appBase: `${u.protocol}//${host}${port ? `:${port}` : ""}`,
+                apiBase: `${u.protocol}//${host}${port ? `:${port}` : ""}`,
             };
         }
         const bare = host.replace(/^(app|api)\./, "");
         return {
-            appBase: `${u.protocol}//app.${bare}${u.port ? `:${u.port}` : ""}`,
-            apiBase: `${u.protocol}//api.${bare}${u.port ? `:${u.port}` : ""}`,
+            appBase: `${u.protocol}//app.${bare}${port ? `:${port}` : ""}`,
+            apiBase: `${u.protocol}//api.${bare}${port ? `:${port}` : ""}`,
         };
     }
     catch {
@@ -56,8 +58,8 @@ export function resolveServicePath(resource) {
  * Workers, libraries, SDKs and migrators have no Traefik route, so they are
  * skipped rather than reported as unreachable.
  */
-export function buildHealthTargets(resources) {
-    const { appBase, apiBase } = resolveSubdomainBases();
+export function buildHealthTargets(resources, ingressPort) {
+    const { appBase, apiBase } = resolveSubdomainBases(ingressPort);
     return resources
         .filter((resource) => resource.config?.appType === "frontend" || resource.config?.appType === "backend")
         .map((resource) => {

package/cli/package.json

@@ -1,7 +1,7 @@
 {
   "name": "tdk-cli-internal",
   "private": true,
-  "version": "1.3.79",
+  "version": "1.3.81",
   "description": "TDK CLI - Tilt Development Kit command line interface",
   "keywords": [
     "tdk",

package/engine/schemas/project-schema.json

@@ -0,0 +1,142 @@
+{
+  "$schema": "http://json-schema.org/draft-07/schema#",
+  "$id": "https://raw.githubusercontent.com/tdk-landscape/tdk-cli-core/main/engine/schemas/project-schema.json",
+  "title": "TDK Project Configuration",
+  "description": "Editor assistance for .tdk/project.json. TDK's CLI remains the runtime source of truth.",
+  "type": "object",
+  "additionalProperties": true,
+  "required": [
+    "version",
+    "project",
+    "phases",
+    "optional_infra",
+    "discovery"
+  ],
+  "properties": {
+    "version": {
+      "type": "string"
+    },
+    "project": {
+      "type": "object",
+      "additionalProperties": true,
+      "required": [
+        "name",
+        "version"
+      ],
+      "properties": {
+        "name": {
+          "type": "string"
+        },
+        "version": {
+          "type": "string"
+        }
+      }
+    },
+    "phases": {
+      "type": "object",
+      "additionalProperties": true,
+      "required": [
+        "pre_alpha",
+        "alpha",
+        "beta",
+        "out_of_scope"
+      ],
+      "properties": {
+        "pre_alpha": {
+          "$ref": "#/definitions/phase"
+        },
+        "alpha": {
+          "$ref": "#/definitions/phase"
+        },
+        "beta": {
+          "$ref": "#/definitions/phase"
+        },
+        "out_of_scope": {
+          "$ref": "#/definitions/phase"
+        }
+      }
+    },
+    "stacks": {
+      "type": "object",
+      "additionalProperties": true
+    },
+    "always_enabled_infra": {
+      "type": "array",
+      "items": {
+        "type": "string"
+      }
+    },
+    "optional_infra": {
+      "type": "object",
+      "additionalProperties": true,
+      "required": [
+        "monitoring",
+        "elk",
+        "debezium",
+        "golden_image",
+        "verdaccio"
+      ],
+      "properties": {
+        "monitoring": {
+          "type": "boolean"
+        },
+        "elk": {
+          "type": "boolean"
+        },
+        "debezium": {
+          "type": "boolean"
+        },
+        "golden_image": {
+          "type": "boolean"
+        },
+        "verdaccio": {
+          "type": "boolean"
+        }
+      }
+    },
+    "discovery": {
+      "type": "object",
+      "additionalProperties": true,
+      "required": [
+        "paths"
+      ],
+      "properties": {
+        "paths": {
+          "type": "array",
+          "items": {
+            "type": "string"
+          }
+        }
+      }
+    },
+    "overrides": {
+      "type": "object",
+      "additionalProperties": true
+    }
+  },
+  "definitions": {
+    "phase": {
+      "type": "object",
+      "additionalProperties": true,
+      "required": [
+        "name",
+        "description",
+        "enabledStacks"
+      ],
+      "properties": {
+        "name": {
+          "type": "string"
+        },
+        "description": {
+          "type": "string"
+        },
+        "enabledStacks": {
+          "type": "array",
+          "items": {
+            "type": "string"
+          }
+        }
+      }
+    }
+  }
+}

package/engine/topologies/platform/docker/compose/traefik_standalone.star

@@ -10,7 +10,7 @@ load("../config/healthcheck.star", "compose_healthcheck_timing")
 load("../networking/traefik_static_routes.star", "normalize_abs_path")
 
 
-def generate_standalone_traefik_compose(sablier_enabled = False):
+def generate_standalone_traefik_compose(sablier_enabled = False, http_host_port = "8080", https_host_port = "8443"):
     """Minimal Traefik that routes Docker labels on api.{project}.localhost.
 
     The Sablier plugin, the sablier container and the wake gateway are only
@@ -48,8 +48,8 @@ services:
       - "--entrypoints.websecure.address=:443"
       - "--log.level=INFO"
 {sablier_flags}    ports:
-      - "80:80"
-      - "8080:8080"
+      - "{http_host_port}:80"
+      - "{https_host_port}:443"
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock:ro
       - ./{dynamic_dir_name}:/etc/traefik/dynamic:ro
@@ -65,6 +65,8 @@ services:
 """.format(
         name=name,
         network=network,
+        http_host_port=http_host_port,
+        https_host_port=https_host_port,
         healthcheck_timing=compose_healthcheck_timing(10),
         traefik_depends_on=_SABLIER_DEPENDS_ON if sablier_enabled else "",
         sablier_flags=_SABLIER_FLAGS if sablier_enabled else "",

package/engine/topologies/tilt/resources/infra-loader.star

@@ -70,7 +70,7 @@ services:
       POSTGRES_PASSWORD: ${{DB_PASSWORD}}
       POSTGRES_DB: postgres
     ports:
-      - "5432:5432"
+      - "{host_port}:5432"
     volumes:
       - {name}_postgres_data:/var/lib/postgresql/data
     networks:
@@ -88,7 +88,7 @@ networks:
 
 volumes:
   {name}_postgres_data:
-""".format(name=name, database_network=database_network)
+""".format(name=name, database_network=database_network, host_port=os.environ.get('TDK_POSTGRES_PORT', '15432'))
 
 
 def _ensure_database_management_compose(root_prefix, write_fn):
@@ -174,43 +174,18 @@ def _load_infisical(should_enable, root_prefix="", env_file=None):
 # 🌐 PROXY (Traefik)
 # =============================================================================
 
-def _stop_conflicting_traefik():
-    """Auto-stop another TDK project's standalone Traefik if it already holds
-    host port 80/8080, so `tdk up` on a new project always wins over a stale
-    Traefik left running from a previous one.
-
-    Each standalone project gets its own container name and Docker network
-    (see PlatformDockerConstants.PROJECT_NAME), but the host ports are hardcoded
-    to 80/8080 so `api.{project}.localhost` works without a port suffix. That
-    means only one standalone project's Traefik can run at a time. Without this,
-    starting a second project while another's Traefik is still running fails
-    deep inside `docker compose up` with a cryptic "port is already allocated"
-    networking error instead of just taking over the port.
-    """
-    own_container = PlatformDockerConstants.PROJECT_NAME + "_traefik"
-    result = str(local(
-        "docker ps --filter 'publish=80' --filter 'publish=8080' --format '{{.Names}}' 2>/dev/null || true",
-        quiet=True, echo_off=True,
-    )).strip()
-    for container in result.split("\n"):
-        container = container.strip()
-        if container and container != own_container:
-            print("🛑 Stopping Traefik from another TDK project ('{}') — it was holding host port 80/8080".format(container))
-            local(
-                "docker stop '{}' >/dev/null 2>&1 || true".format(container),
-                quiet=True, echo_off=True,
-            )
-
-
 def _load_standalone_traefik(root_prefix, env_file, write_fn):
     """Generate and load a self-contained Traefik compose for standalone projects."""
-    _stop_conflicting_traefik()
     compose_rel = ".tdk/.tdk-out/docker-compose.traefik.yml"
     # The free-tier stub always reports "disabled"; the licensed module reports
     # enabled for a manifest that opts in. Probing it keeps this file free of any
     # license logic while starting the sablier containers only when they can work.
     _, sablier_enabled = sablier_middleware_suffix({"sablier": {"enable": True}}, "probe")
-    content = generate_standalone_traefik_compose(sablier_enabled)
+    content = generate_standalone_traefik_compose(
+        sablier_enabled,
+        os.environ.get('TDK_HTTP_PORT', '8080'),
+        os.environ.get('TDK_HTTPS_PORT', '8443'),
+    )
     if write_fn:
         write_fn(compose_rel, content)
     compose_file = root_prefix + compose_rel if root_prefix else compose_rel

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tdk-landscape/tdk-cli-core",
-  "version": "1.3.79",
-  "description": "Run your whole microservice landscape locally without Kubernetes. Scaffold services and run them with hot reload, built on Tilt.",
+  "version": "1.3.81",
+  "description": "TDK runs many services on your laptop with Docker + Tilt. Helm still deploys the cluster.",
   "homepage": "https://tdk-landscape.github.io/tdk-website",
   "repository": {
     "type": "git",