@geekmidas/cli 0.13.0 → 0.15.0

package/src/deploy/__tests__/init.spec.ts

@@ -41,7 +41,7 @@ describe('Dokploy API interactions', () => {
 					method: 'GET',
 					headers: {
 						'Content-Type': 'application/json',
-						Authorization: 'Bearer test-token',
+						'x-api-key': 'test-token',
 					},
 				},
 			);
@@ -62,11 +62,18 @@ describe('Dokploy API interactions', () => {
 							description?: string;
 						};
 						return HttpResponse.json({
-							projectId: 'proj_new',
-							name: body.name,
-							description: body.description || null,
-							createdAt: new Date().toISOString(),
-							adminId: 'admin_1',
+							project: {
+								projectId: 'proj_new',
+								name: body.name,
+								description: body.description || null,
+								createdAt: new Date().toISOString(),
+								adminId: 'admin_1',
+							},
+							environment: {
+								environmentId: 'env_default',
+								name: 'production',
+								description: 'Production environment',
+							},
 						});
 					},
 				),
@@ -78,7 +85,7 @@ describe('Dokploy API interactions', () => {
 					method: 'POST',
 					headers: {
 						'Content-Type': 'application/json',
-						Authorization: 'Bearer test-token',
+						'x-api-key': 'test-token',
 					},
 					body: JSON.stringify({
 						name: 'New Project',
@@ -88,9 +95,10 @@ describe('Dokploy API interactions', () => {
 			);
 
 			expect(response.ok).toBe(true);
-			const project = await response.json();
-			expect(project.projectId).toBe('proj_new');
-			expect(project.name).toBe('New Project');
+			const result = await response.json();
+			expect(result.project.projectId).toBe('proj_new');
+			expect(result.project.name).toBe('New Project');
+			expect(result.environment.environmentId).toBe('env_default');
 		});
 
 		it('should get a single project', async () => {
@@ -120,7 +128,7 @@ describe('Dokploy API interactions', () => {
 					method: 'POST',
 					headers: {
 						'Content-Type': 'application/json',
-						Authorization: 'Bearer test-token',
+						'x-api-key': 'test-token',
 					},
 					body: JSON.stringify({ projectId: 'proj_1' }),
 				},
@@ -159,7 +167,7 @@ describe('Dokploy API interactions', () => {
 					method: 'POST',
 					headers: {
 						'Content-Type': 'application/json',
-						Authorization: 'Bearer test-token',
+						'x-api-key': 'test-token',
 					},
 					body: JSON.stringify({
 						name: 'api',
@@ -194,7 +202,7 @@ describe('Dokploy API interactions', () => {
 					method: 'POST',
 					headers: {
 						'Content-Type': 'application/json',
-						Authorization: 'Bearer test-token',
+						'x-api-key': 'test-token',
 					},
 					body: JSON.stringify({
 						applicationId: 'app_1',
@@ -229,7 +237,7 @@ describe('Dokploy API interactions', () => {
 					method: 'GET',
 					headers: {
 						'Content-Type': 'application/json',
-						Authorization: 'Bearer test-token',
+						'x-api-key': 'test-token',
 					},
 				},
 			);
@@ -265,7 +273,7 @@ describe('Dokploy API interactions', () => {
 					method: 'POST',
 					headers: {
 						'Content-Type': 'application/json',
-						Authorization: 'Bearer test-token',
+						'x-api-key': 'test-token',
 					},
 					body: JSON.stringify({
 						projectId: 'proj_1',
@@ -298,7 +306,7 @@ describe('Dokploy API interactions', () => {
 					method: 'GET',
 					headers: {
 						'Content-Type': 'application/json',
-						Authorization: 'Bearer invalid-token',
+						'x-api-key': 'invalid-token',
 					},
 				},
 			);
@@ -659,4 +667,127 @@ export default defineConfig({
 			),
 		).resolves.toBeUndefined();
 	});
+
+	it('should include registryId when provided', async () => {
+		const configPath = join(tempDir, 'gkm.config.ts');
+		await writeFile(
+			configPath,
+			`import { defineConfig } from '@geekmidas/cli';
+
+export default defineConfig({
+	routes: 'src/endpoints/**/*.ts',
+	envParser: './src/env.ts',
+});`,
+		);
+
+		await updateConfig(
+			{
+				endpoint: 'https://dokploy.example.com',
+				projectId: 'proj_123',
+				applicationId: 'app_456',
+				registryId: 'reg_789',
+			},
+			tempDir,
+		);
+
+		const content = await readFile(configPath, 'utf-8');
+		expect(content).toContain("registryId: 'reg_789'");
+		expect(content).toContain("endpoint: 'https://dokploy.example.com'");
+		expect(content).toContain("projectId: 'proj_123'");
+		expect(content).toContain("applicationId: 'app_456'");
+	});
+
+	it('should omit registryId when not provided', async () => {
+		const configPath = join(tempDir, 'gkm.config.ts');
+		await writeFile(
+			configPath,
+			`import { defineConfig } from '@geekmidas/cli';
+
+export default defineConfig({
+	routes: 'src/endpoints/**/*.ts',
+});`,
+		);
+
+		await updateConfig(
+			{
+				endpoint: 'https://dokploy.example.com',
+				projectId: 'proj_123',
+				applicationId: 'app_456',
+			},
+			tempDir,
+		);
+
+		const content = await readFile(configPath, 'utf-8');
+		expect(content).not.toContain('registryId:');
+	});
+
+	it('should update existing dokploy config with registryId', async () => {
+		const configPath = join(tempDir, 'gkm.config.ts');
+		await writeFile(
+			configPath,
+			`import { defineConfig } from '@geekmidas/cli';
+
+export default defineConfig({
+	routes: 'src/endpoints/**/*.ts',
+	providers: {
+		dokploy: {
+			endpoint: 'https://old.dokploy.com',
+			projectId: 'old_proj',
+			applicationId: 'old_app',
+		},
+	},
+});`,
+		);
+
+		await updateConfig(
+			{
+				endpoint: 'https://new.dokploy.com',
+				projectId: 'new_proj',
+				applicationId: 'new_app',
+				registryId: 'new_reg',
+			},
+			tempDir,
+		);
+
+		const content = await readFile(configPath, 'utf-8');
+		expect(content).toContain("registryId: 'new_reg'");
+		expect(content).toContain("endpoint: 'https://new.dokploy.com'");
+		expect(content).not.toContain('old.dokploy.com');
+	});
+
+	it('should preserve existing config with multi-line dokploy that has registryId', async () => {
+		const configPath = join(tempDir, 'gkm.config.ts');
+		await writeFile(
+			configPath,
+			`import { defineConfig } from '@geekmidas/cli';
+
+export default defineConfig({
+	routes: 'src/endpoints/**/*.ts',
+	providers: {
+		dokploy: {
+			endpoint: 'https://old.dokploy.com',
+			projectId: 'old_proj',
+			applicationId: 'old_app',
+			registryId: 'old_reg',
+		},
+	},
+});`,
+		);
+
+		await updateConfig(
+			{
+				endpoint: 'https://new.dokploy.com',
+				projectId: 'new_proj',
+				applicationId: 'new_app',
+				registryId: 'new_reg',
+			},
+			tempDir,
+		);
+
+		const content = await readFile(configPath, 'utf-8');
+		expect(content).toContain("registryId: 'new_reg'");
+		expect(content).toContain("endpoint: 'https://new.dokploy.com'");
+		expect(content).not.toContain('old.dokploy.com');
+		expect(content).not.toContain('old_reg');
+	});
 });

package/src/deploy/docker.ts

@@ -1,7 +1,68 @@
 import { execSync } from 'node:child_process';
-import type { GkmConfig } from '../types';
+import { existsSync, readFileSync } from 'node:fs';
+import { dirname, join, relative } from 'node:path';
+import type { GkmConfig } from '../config';
+import { dockerCommand, findLockfilePath, isMonorepo } from '../docker';
 import type { DeployResult, DockerDeployConfig } from './types';
 
+/**
+ * Get app name from package.json in the current working directory
+ * Used for Dokploy app/project naming
+ */
+export function getAppNameFromCwd(): string | undefined {
+	const packageJsonPath = join(process.cwd(), 'package.json');
+
+	if (!existsSync(packageJsonPath)) {
+		return undefined;
+	}
+
+	try {
+		const pkg = JSON.parse(readFileSync(packageJsonPath, 'utf-8'));
+		if (pkg.name) {
+			// Strip org scope if present (e.g., @myorg/app -> app)
+			return pkg.name.replace(/^@[^/]+\//, '');
+		}
+	} catch {
+		// Ignore parse errors
+	}
+
+	return undefined;
+}
+
+/**
+ * Get app name from package.json adjacent to the lockfile (project root)
+ * Used for Docker image naming
+ */
+export function getAppNameFromPackageJson(): string | undefined {
+	const cwd = process.cwd();
+
+	// Find the lockfile to determine the project root
+	const lockfilePath = findLockfilePath(cwd);
+	if (!lockfilePath) {
+		return undefined;
+	}
+
+	// Use the package.json adjacent to the lockfile
+	const projectRoot = dirname(lockfilePath);
+	const packageJsonPath = join(projectRoot, 'package.json');
+
+	if (!existsSync(packageJsonPath)) {
+		return undefined;
+	}
+
+	try {
+		const pkg = JSON.parse(readFileSync(packageJsonPath, 'utf-8'));
+		if (pkg.name) {
+			// Strip org scope if present (e.g., @myorg/app -> app)
+			return pkg.name.replace(/^@[^/]+\//, '');
+		}
+	} catch {
+		// Ignore parse errors
+	}
+
+	return undefined;
+}
+
 const logger = console;
 
 export interface DockerDeployOptions {
@@ -37,11 +98,39 @@ export function getImageRef(
 async function buildImage(imageRef: string): Promise<void> {
 	logger.log(`\n🔨 Building Docker image: ${imageRef}`);
 
+	const cwd = process.cwd();
+	const inMonorepo = isMonorepo(cwd);
+
+	// Generate appropriate Dockerfile
+	if (inMonorepo) {
+		logger.log('   Generating Dockerfile for monorepo (turbo prune)...');
+	} else {
+		logger.log('   Generating Dockerfile...');
+	}
+	await dockerCommand({});
+
+	// Determine build context and Dockerfile path
+	let buildCwd = cwd;
+	let dockerfilePath = '.gkm/docker/Dockerfile';
+
+	if (inMonorepo) {
+		// For monorepos, build from root so turbo prune can access all packages
+		const lockfilePath = findLockfilePath(cwd);
+		if (lockfilePath) {
+			const monorepoRoot = dirname(lockfilePath);
+			const appRelPath = relative(monorepoRoot, cwd);
+			dockerfilePath = join(appRelPath, '.gkm/docker/Dockerfile');
+			buildCwd = monorepoRoot;
+			logger.log(`   Building from monorepo root: ${monorepoRoot}`);
+		}
+	}
+
 	try {
+		// Build for linux/amd64 to ensure compatibility with most cloud servers
 		execSync(
-			`DOCKER_BUILDKIT=1 docker build -f .gkm/docker/Dockerfile -t ${imageRef} .`,
+			`DOCKER_BUILDKIT=1 docker build --platform linux/amd64 -f ${dockerfilePath} -t ${imageRef} .`,
 			{
-				cwd: process.cwd(),
+				cwd: buildCwd,
 				stdio: 'inherit',
 				env: { ...process.env, DOCKER_BUILDKIT: '1' },
 			},
@@ -81,7 +170,8 @@ export async function deployDocker(
 ): Promise<DeployResult> {
 	const { stage, tag, skipPush, masterKey, config } = options;
 
-	const imageName = config.imageName ?? 'app';
+	// imageName should always be set by resolveDockerConfig
+	const imageName = config.imageName!;
 	const imageRef = getImageRef(config.registry, imageName, tag);
 
 	// Build image
@@ -119,10 +209,24 @@ export async function deployDocker(
 
 /**
  * Resolve Docker deploy config from gkm config
+ * - imageName: from config, or cwd package.json, or 'app' (for Docker image)
+ * - projectName: from root package.json, or 'app' (for Dokploy project)
+ * - appName: from cwd package.json, or projectName (for Dokploy app within project)
  */
 export function resolveDockerConfig(config: GkmConfig): DockerDeployConfig {
+	// projectName comes from root package.json (monorepo name)
+	const projectName = getAppNameFromPackageJson() ?? 'app';
+
+	// appName comes from cwd package.json (the app being deployed)
+	const appName = getAppNameFromCwd() ?? projectName;
+
+	// imageName defaults to appName (cwd package.json)
+	const imageName = config.docker?.imageName ?? appName;
+
 	return {
 		registry: config.docker?.registry,
-		imageName: config.docker?.imageName,
+		imageName,
+		projectName,
+		appName,
 	};
 }