@tdk-landscape/tdk-cli-core 1.3.103 → 1.3.104

package/README.md

@@ -2,7 +2,7 @@
 
 [![npm version](https://img.shields.io/npm/v/@tdk-landscape/tdk-cli-core.svg?style=flat&color=blue)](https://www.npmjs.com/package/@tdk-landscape/tdk-cli-core)
 [![unpacked size](https://img.shields.io/npm/unpacked-size/@tdk-landscape/tdk-cli-core)](https://packagephobia.com/result?p=@tdk-landscape/tdk-cli-core)
-[![install size](https://packagephobia.com/badge?p=@tdk-landscape/tdk-cli-core@1.3.81)](https://packagephobia.com/result?p=@tdk-landscape/tdk-cli-core@1.3.81)
+[![install size](https://packagephobia.com/badge?p=@tdk-landscape/tdk-cli-core)](https://packagephobia.com/result?p=@tdk-landscape/tdk-cli-core)
 [![CI](https://github.com/tdk-landscape/tdk-cli-core/actions/workflows/ci.yml/badge.svg)](https://github.com/tdk-landscape/tdk-cli-core/actions/workflows/ci.yml)
 [![Quickstart E2E](https://github.com/tdk-landscape/tdk-cli-core/actions/workflows/quickstart-e2e.yml/badge.svg)](https://github.com/tdk-landscape/tdk-cli-core/actions/workflows/quickstart-e2e.yml)
 [![ERP fixture scale E2E](https://github.com/tdk-landscape/tdk-cli-core/actions/workflows/erp-scale-e2e.yml/badge.svg)](https://github.com/tdk-landscape/tdk-cli-core/actions/workflows/erp-scale-e2e.yml)

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

@@ -19,6 +19,7 @@ const KNOWN_SERVICE_FIELDS = new Set([
     "backendName",
     "basePath",
     "build",
+    "buildContext",
     "databaseName",
     "dependencies",
     "dev",

package/cli/package.json

@@ -1,7 +1,7 @@
 {
   "name": "tdk-cli-internal",
   "private": true,
-  "version": "1.3.103",
+  "version": "1.3.104",
   "description": "TDK CLI — start services on your laptop.",
   "keywords": [
     "tdk",

package/discovery/manifest/loading.star

@@ -233,7 +233,12 @@ def _apply_manifest_defaults(manifest, resource_path):
     # Validate custom dockerfile exists if specified
     if 'dockerfile' in result:
         custom_dockerfile = result['dockerfile']
-        dockerfile_path = resource_path + '/' + custom_dockerfile
+        # With a bring-your-own buildContext the dockerfile is relative to that context.
+        build_context = result.get('buildContext')
+        if build_context and build_context != '.':
+            dockerfile_path = resource_path + '/' + build_context + '/' + custom_dockerfile
+        else:
+            dockerfile_path = resource_path + '/' + custom_dockerfile
         # BUG FIX: Run check from project root since Tilt may run from .tdk/.tdk-out/
         project_root = os.environ.get('TDK_PROJECT_ROOT', '')
         if project_root:

package/engine/schemas/service-schema.json

@@ -162,6 +162,10 @@
       "description": "Custom Dockerfile path relative to resource directory. Optional for bring-your-own type.",
       "type": "string"
     },
+    "buildContext": {
+      "description": "Docker build context for a bring-your-own resource, relative to the resource directory. Defaults to the resource directory. When set, dockerfile is relative to this context.",
+      "type": "string"
+    },
     "exposeViaProxy": {
       "description": "Whether this bring-your-own resource receives a Traefik route. Defaults to true.",
       "type": "boolean"

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

@@ -207,6 +207,12 @@ def _generate_single_backend_entry(resource_path, resource_name, res, manifest,
             # context instead of the project root used by generated TDK apps.
             context_prefix = '/'.join(['..'] * (len(resource_path.split('/')) + 1))
             build_context = context_prefix + '/' + full_resource_path
+            # `buildContext` (relative to the service directory) moves the context
+            # to the source tree an imported Dockerfile lives in; `dockerfile` is then
+            # relative to that context, as in Compose.
+            custom_context = manifest.get('buildContext')
+            if custom_context and custom_context != '.':
+                build_context = build_context + '/' + custom_context
             dockerfile = manifest.get('dockerfile', 'Dockerfile')
             if dockerfile.startswith('./'):
                 dockerfile = dockerfile[2:]

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tdk-landscape/tdk-cli-core",
-  "version": "1.3.103",
+  "version": "1.3.104",
   "description": "TDK CLI — start services on your laptop.",
   "homepage": "https://tdk-landscape.github.io/tdk-website",
   "repository": {