use relative paths for Docker

Author: stevensJourney

examples/self-hosted/local-postgres/powersync/docker/docker-compose.yaml

@@ -5,8 +5,8 @@
 
 include:
   [
-    /Users/stevenontong/Documents/platform_code/powersync/new-cli/examples/self-hosted/docker/powersync/docker/modules/database-postgres/postgres.database.compose.yaml,
-    /Users/stevenontong/Documents/platform_code/powersync/new-cli/examples/self-hosted/docker/powersync/docker/modules/storage-postgres/postgres.storage.compose.yaml
+    modules/database-postgres/postgres.database.compose.yaml,
+    modules/storage-postgres/postgres.storage.compose.yaml
   ]
 
 services:

examples/self-hosted/local-postgres/powersync/link.yaml

@@ -8,4 +8,4 @@ api_url: http://localhost:8080
 api_key: dev-token-do-not-use-in-production
 plugins:
   docker:
-    project_name: powersync_docker
+    project_name: powersync_local-postgres

plugins/docker/src/commands/docker/configure.ts

@@ -87,6 +87,7 @@ export default class DockerConfigure extends SelfHostedInstanceCommand {
     const moduleContext: DockerModuleContext = {
       command: this,
       projectdirectory: projectDirectory,
+      composeOutputDirectory: targetDockerDir,
       modulesOutputDirectory: modulesDir,
       mainComposeDocument,
       serviceConfig: serviceConfigDocument

plugins/docker/src/commands/docker/start.ts

@@ -1,5 +1,5 @@
 import { ux } from '@oclif/core';
-import { SelfHostedInstanceCommand, type SelfHostedInstanceCommandFlags } from '@powersync/cli-core';
+import { SelfHostedInstanceCommand } from '@powersync/cli-core';
 import { getDockerProjectName, logPowersyncProjectsStopHelp, runDockerCompose } from '../../docker.js';
 
 export default class DockerStart extends SelfHostedInstanceCommand {
@@ -13,7 +13,7 @@ export default class DockerStart extends SelfHostedInstanceCommand {
 
   async run(): Promise<void> {
     const { flags } = await this.parse(DockerStart);
-    const { projectDirectory } = this.loadProject(flags as SelfHostedInstanceCommandFlags, {
+    const { projectDirectory } = this.loadProject(flags, {
       configFileRequired: false,
       linkingIsRequired: false
     });

plugins/docker/src/templates/bucket-storage/postgres/PostgresBucketStorageModule.ts

@@ -27,7 +27,8 @@ const PostgresBucketStorageModule: DockerModule = {
       fs.cpSync(initScriptsSrc, initScriptsDest, { recursive: true });
     }
 
-    (mainComposeDocument.get('include') as YAMLSeq).add(storageComposeFilePath);
+    const includePath = path.relative(context.composeOutputDirectory, storageComposeFilePath);
+    (mainComposeDocument.get('include') as YAMLSeq).add(includePath);
 
     const servicesNode = mainComposeDocument.get('services');
     if (isMap(servicesNode)) {

plugins/docker/src/templates/source-database/postgres/PostgresSourceDatabaseModule.ts

@@ -43,7 +43,8 @@ const PostgresSourceDatabaseModule: DockerModule = {
       fs.cpSync(initScriptsSrc, initScriptsDest, { recursive: true });
     }
 
-    (mainComposeDocument.get('include') as YAMLSeq).add(databaseComposeFilePath);
+    const includePath = path.relative(context.composeOutputDirectory, databaseComposeFilePath);
+    (mainComposeDocument.get('include') as YAMLSeq).add(includePath);
 
     const servicesNode = mainComposeDocument.get('services');
     if (isMap(servicesNode)) {

plugins/docker/src/types.ts

@@ -11,6 +11,8 @@ export type DockerModuleContext = {
   /** Invoking command, for logging and output. */
   command: Command;
   projectdirectory: string;
+  /** Directory containing docker-compose.yaml (powersync/docker/). Used for relative include paths. */
+  composeOutputDirectory: string;
   modulesOutputDirectory: string;
   /** Main docker-compose document (docker/). Modules may add to include and services.powersync.depends_on. */
   mainComposeDocument: Document;