@geekmidas/cli 0.18.0 → 0.20.0

package/src/docker/compose.ts

@@ -3,6 +3,10 @@ import type {
 	ComposeServicesConfig,
 	ServiceConfig,
 } from '../types';
+import type {
+	NormalizedAppConfig,
+	NormalizedWorkspace,
+} from '../workspace/types.js';
 
 /** Default Docker images for services */
 export const DEFAULT_SERVICE_IMAGES: Record<ComposeServiceName, string> = {
@@ -271,3 +275,247 @@ networks:
     driver: bridge
 `;
 }
+
+/**
+ * Options for workspace compose generation.
+ */
+export interface WorkspaceComposeOptions {
+	/** Container registry URL */
+	registry?: string;
+}
+
+/**
+ * Generate docker-compose.yml for a workspace with all apps as services.
+ * Apps can communicate with each other via service names.
+ * @internal Exported for testing
+ */
+export function generateWorkspaceCompose(
+	workspace: NormalizedWorkspace,
+	options: WorkspaceComposeOptions = {},
+): string {
+	const { registry } = options;
+	const apps = Object.entries(workspace.apps);
+	const services = workspace.services;
+
+	// Determine which infrastructure services to include
+	const hasPostgres = services.db !== undefined && services.db !== false;
+	const hasRedis = services.cache !== undefined && services.cache !== false;
+	const hasMail = services.mail !== undefined && services.mail !== false;
+
+	// Get image versions from config
+	const postgresImage = getInfraServiceImage('postgres', services.db);
+	const redisImage = getInfraServiceImage('redis', services.cache);
+
+	let yaml = `# Docker Compose for ${workspace.name} workspace
+# Generated by gkm - do not edit manually
+
+services:
+`;
+
+	// Generate service for each app
+	for (const [appName, app] of apps) {
+		yaml += generateAppService(appName, app, apps, {
+			registry,
+			hasPostgres,
+			hasRedis,
+		});
+	}
+
+	// Add infrastructure services
+	if (hasPostgres) {
+		yaml += `
+  postgres:
+    image: ${postgresImage}
+    container_name: ${workspace.name}-postgres
+    restart: unless-stopped
+    environment:
+      POSTGRES_USER: \${POSTGRES_USER:-postgres}
+      POSTGRES_PASSWORD: \${POSTGRES_PASSWORD:-postgres}
+      POSTGRES_DB: \${POSTGRES_DB:-app}
+    volumes:
+      - postgres_data:/var/lib/postgresql/data
+    healthcheck:
+      test: ["CMD-SHELL", "pg_isready -U postgres"]
+      interval: 5s
+      timeout: 5s
+      retries: 5
+    networks:
+      - workspace-network
+`;
+	}
+
+	if (hasRedis) {
+		yaml += `
+  redis:
+    image: ${redisImage}
+    container_name: ${workspace.name}-redis
+    restart: unless-stopped
+    volumes:
+      - redis_data:/data
+    healthcheck:
+      test: ["CMD", "redis-cli", "ping"]
+      interval: 5s
+      timeout: 5s
+      retries: 5
+    networks:
+      - workspace-network
+`;
+	}
+
+	if (hasMail) {
+		yaml += `
+  mailpit:
+    image: axllent/mailpit:latest
+    container_name: ${workspace.name}-mailpit
+    restart: unless-stopped
+    ports:
+      - "8025:8025"  # Web UI
+      - "1025:1025"  # SMTP
+    networks:
+      - workspace-network
+`;
+	}
+
+	// Add volumes section
+	yaml += `
+volumes:
+`;
+
+	if (hasPostgres) {
+		yaml += `  postgres_data:
+`;
+	}
+
+	if (hasRedis) {
+		yaml += `  redis_data:
+`;
+	}
+
+	// Add networks section
+	yaml += `
+networks:
+  workspace-network:
+    driver: bridge
+`;
+
+	return yaml;
+}
+
+/**
+ * Get infrastructure service image with version.
+ */
+function getInfraServiceImage(
+	serviceName: 'postgres' | 'redis',
+	config: boolean | { version?: string; image?: string } | undefined,
+): string {
+	const defaults: Record<'postgres' | 'redis', string> = {
+		postgres: 'postgres:16-alpine',
+		redis: 'redis:7-alpine',
+	};
+
+	if (!config || config === true) {
+		return defaults[serviceName];
+	}
+
+	if (typeof config === 'object') {
+		if (config.image) {
+			return config.image;
+		}
+		if (config.version) {
+			const baseImage = serviceName === 'postgres' ? 'postgres' : 'redis';
+			return `${baseImage}:${config.version}`;
+		}
+	}
+
+	return defaults[serviceName];
+}
+
+/**
+ * Generate a service definition for an app.
+ */
+function generateAppService(
+	appName: string,
+	app: NormalizedAppConfig,
+	allApps: [string, NormalizedAppConfig][],
+	options: {
+		registry?: string;
+		hasPostgres: boolean;
+		hasRedis: boolean;
+	},
+): string {
+	const { registry, hasPostgres, hasRedis } = options;
+	const imageRef = registry ? `\${REGISTRY:-${registry}}/` : '';
+
+	// Health check path - frontends use /, backends use /health
+	const healthCheckPath = app.type === 'frontend' ? '/' : '/health';
+	const healthCheckCmd =
+		app.type === 'frontend'
+			? `["CMD", "wget", "-q", "--spider", "http://localhost:${app.port}/"]`
+			: `["CMD", "wget", "-q", "--spider", "http://localhost:${app.port}${healthCheckPath}"]`;
+
+	let yaml = `
+  ${appName}:
+    build:
+      context: .
+      dockerfile: .gkm/docker/Dockerfile.${appName}
+    image: ${imageRef}\${${appName.toUpperCase()}_IMAGE:-${appName}}:\${TAG:-latest}
+    container_name: ${appName}
+    restart: unless-stopped
+    ports:
+      - "\${${appName.toUpperCase()}_PORT:-${app.port}}:${app.port}"
+    environment:
+      - NODE_ENV=production
+      - PORT=${app.port}
+`;
+
+	// Add dependency URLs - apps can reach other apps by service name
+	for (const dep of app.dependencies) {
+		const depApp = allApps.find(([name]) => name === dep)?.[1];
+		if (depApp) {
+			yaml += `      - ${dep.toUpperCase()}_URL=http://${dep}:${depApp.port}
+`;
+		}
+	}
+
+	// Add infrastructure service URLs for backend apps
+	if (app.type === 'backend') {
+		if (hasPostgres) {
+			yaml += `      - DATABASE_URL=\${DATABASE_URL:-postgresql://postgres:postgres@postgres:5432/app}
+`;
+		}
+		if (hasRedis) {
+			yaml += `      - REDIS_URL=\${REDIS_URL:-redis://redis:6379}
+`;
+		}
+	}
+
+	yaml += `    healthcheck:
+      test: ${healthCheckCmd}
+      interval: 30s
+      timeout: 3s
+      retries: 3
+`;
+
+	// Add depends_on for dependencies and infrastructure
+	const dependencies: string[] = [...app.dependencies];
+	if (app.type === 'backend') {
+		if (hasPostgres) dependencies.push('postgres');
+		if (hasRedis) dependencies.push('redis');
+	}
+
+	if (dependencies.length > 0) {
+		yaml += `    depends_on:
+`;
+		for (const dep of dependencies) {
+			yaml += `      ${dep}:
+        condition: service_healthy
+`;
+		}
+	}
+
+	yaml += `    networks:
+      - workspace-network
+`;
+
+	return yaml;
+}

package/src/docker/index.ts

@@ -2,14 +2,21 @@ import { execSync } from 'node:child_process';
 import { copyFileSync, existsSync, unlinkSync } from 'node:fs';
 import { mkdir, writeFile } from 'node:fs/promises';
 import { basename, join } from 'node:path';
-import { loadConfig } from '../config';
-import { generateDockerCompose, generateMinimalDockerCompose } from './compose';
+import { loadConfig, loadWorkspaceConfig } from '../config';
+import type { NormalizedWorkspace } from '../workspace/types.js';
+import {
+	generateDockerCompose,
+	generateMinimalDockerCompose,
+	generateWorkspaceCompose,
+} from './compose';
 import {
 	detectPackageManager,
 	findLockfilePath,
+	generateBackendDockerfile,
 	generateDockerEntrypoint,
 	generateDockerignore,
 	generateMultiStageDockerfile,
+	generateNextjsDockerfile,
 	generateSlimDockerfile,
 	hasTurboConfig,
 	isMonorepo,
@@ -58,7 +65,17 @@ export interface DockerGeneratedFiles {
  */
 export async function dockerCommand(
 	options: DockerOptions,
-): Promise<DockerGeneratedFiles> {
+): Promise<DockerGeneratedFiles | WorkspaceDockerResult> {
+	// Load config with workspace detection
+	const loadedConfig = await loadWorkspaceConfig();
+
+	// Route to workspace docker mode for multi-app workspaces
+	if (loadedConfig.type === 'workspace') {
+		logger.log('📦 Detected workspace configuration');
+		return workspaceDockerCommand(loadedConfig.workspace, options);
+	}
+
+	// Single-app mode - use existing logic
 	const config = await loadConfig();
 	const dockerConfig = resolveDockerConfig(config);
 
@@ -318,3 +335,142 @@ async function pushDockerImage(
 		);
 	}
 }
+
+/**
+ * Result of generating Docker files for a single app in a workspace.
+ */
+export interface AppDockerResult {
+	appName: string;
+	type: 'backend' | 'frontend';
+	dockerfile: string;
+	imageName: string;
+}
+
+/**
+ * Result of workspace docker command.
+ */
+export interface WorkspaceDockerResult {
+	apps: AppDockerResult[];
+	dockerCompose: string;
+	dockerignore: string;
+}
+
+/**
+ * Get the package name from package.json in an app directory.
+ */
+function getAppPackageName(appPath: string): string | undefined {
+	try {
+		// eslint-disable-next-line @typescript-eslint/no-require-imports
+		const pkg = require(`${appPath}/package.json`);
+		return pkg.name;
+	} catch {
+		return undefined;
+	}
+}
+
+/**
+ * Generate Dockerfiles for all apps in a workspace.
+ * @internal Exported for testing
+ */
+export async function workspaceDockerCommand(
+	workspace: NormalizedWorkspace,
+	options: DockerOptions,
+): Promise<WorkspaceDockerResult> {
+	const results: AppDockerResult[] = [];
+	const apps = Object.entries(workspace.apps);
+
+	logger.log(`\n🐳 Generating Dockerfiles for workspace: ${workspace.name}`);
+
+	// Create docker output directory
+	const dockerDir = join(workspace.root, '.gkm', 'docker');
+	await mkdir(dockerDir, { recursive: true });
+
+	// Detect package manager
+	const packageManager = detectPackageManager(workspace.root);
+	logger.log(`   Package manager: ${packageManager}`);
+
+	// Generate Dockerfile for each app
+	for (const [appName, app] of apps) {
+		const appPath = app.path;
+		const fullAppPath = join(workspace.root, appPath);
+
+		// Get package name for turbo prune (use package.json name or app name)
+		const turboPackage = getAppPackageName(fullAppPath) ?? appName;
+
+		// Determine image name
+		const imageName = appName;
+
+		logger.log(`\n   📄 Generating Dockerfile for ${appName} (${app.type})`);
+
+		let dockerfile: string;
+
+		if (app.type === 'frontend') {
+			// Generate Next.js Dockerfile
+			dockerfile = generateNextjsDockerfile({
+				imageName,
+				baseImage: 'node:22-alpine',
+				port: app.port,
+				appPath,
+				turboPackage,
+				packageManager,
+			});
+		} else {
+			// Generate backend Dockerfile
+			dockerfile = generateBackendDockerfile({
+				imageName,
+				baseImage: 'node:22-alpine',
+				port: app.port,
+				appPath,
+				turboPackage,
+				packageManager,
+				healthCheckPath: '/health',
+			});
+		}
+
+		// Write Dockerfile with app-specific name
+		const dockerfilePath = join(dockerDir, `Dockerfile.${appName}`);
+		await writeFile(dockerfilePath, dockerfile);
+		logger.log(`      Generated: .gkm/docker/Dockerfile.${appName}`);
+
+		results.push({
+			appName,
+			type: app.type,
+			dockerfile: dockerfilePath,
+			imageName,
+		});
+	}
+
+	// Generate shared .dockerignore
+	const dockerignore = generateDockerignore();
+	const dockerignorePath = join(workspace.root, '.dockerignore');
+	await writeFile(dockerignorePath, dockerignore);
+	logger.log(`\n   Generated: .dockerignore (workspace root)`);
+
+	// Generate docker-compose.yml for workspace
+	const dockerCompose = generateWorkspaceCompose(workspace, {
+		registry: options.registry,
+	});
+	const composePath = join(dockerDir, 'docker-compose.yml');
+	await writeFile(composePath, dockerCompose);
+	logger.log(`   Generated: .gkm/docker/docker-compose.yml`);
+
+	// Summary
+	logger.log(
+		`\n✅ Generated ${results.length} Dockerfile(s) + docker-compose.yml`,
+	);
+	logger.log('\n📋 Build commands:');
+	for (const result of results) {
+		const icon = result.type === 'backend' ? '⚙️' : '🌐';
+		logger.log(
+			`   ${icon} docker build -f .gkm/docker/Dockerfile.${result.appName} -t ${result.imageName} .`,
+		);
+	}
+	logger.log('\n📋 Run all services:');
+	logger.log('   docker compose -f .gkm/docker/docker-compose.yml up --build');
+
+	return {
+		apps: results,
+		dockerCompose: composePath,
+		dockerignore: dockerignorePath,
+	};
+}

package/src/docker/templates.ts

@@ -15,6 +15,18 @@ export interface DockerTemplateOptions {
 	packageManager: PackageManager;
 }
 
+export interface FrontendDockerfileOptions {
+	imageName: string;
+	baseImage: string;
+	port: number;
+	/** App path relative to workspace root */
+	appPath: string;
+	/** Package name for turbo prune */
+	turboPackage: string;
+	/** Detected package manager */
+	packageManager: PackageManager;
+}
+
 export interface MultiStageDockerfileOptions extends DockerTemplateOptions {
 	/** Enable turbo prune for monorepo optimization */
 	turbo?: boolean;
@@ -274,8 +286,14 @@ WORKDIR /app
 # Copy source (deps already installed)
 COPY . .
 
-# Build production server using CLI from project dependencies
-RUN ${pm.exec} gkm build --provider server --production
+# Debug: Show node_modules/.bin contents and build production server
+RUN echo "=== node_modules/.bin contents ===" && \
+    ls -la node_modules/.bin/ 2>/dev/null || echo "node_modules/.bin not found" && \
+    echo "=== Checking for gkm ===" && \
+    which gkm 2>/dev/null || echo "gkm not in PATH" && \
+    ls -la node_modules/.bin/gkm 2>/dev/null || echo "gkm binary not found in node_modules/.bin" && \
+    echo "=== Running build ===" && \
+    ./node_modules/.bin/gkm build --provider server --production
 
 # Stage 3: Production
 FROM ${baseImage} AS runner
@@ -365,8 +383,14 @@ WORKDIR /app
 # Copy pruned source
 COPY --from=pruner /app/out/full/ ./
 
-# Build production server using CLI from project dependencies
-RUN ${pm.exec} gkm build --provider server --production
+# Debug: Show node_modules/.bin contents and build production server
+RUN echo "=== node_modules/.bin contents ===" && \
+    ls -la node_modules/.bin/ 2>/dev/null || echo "node_modules/.bin not found" && \
+    echo "=== Checking for gkm ===" && \
+    which gkm 2>/dev/null || echo "gkm not in PATH" && \
+    ls -la node_modules/.bin/gkm 2>/dev/null || echo "gkm binary not found in node_modules/.bin" && \
+    echo "=== Running build ===" && \
+    ./node_modules/.bin/gkm build --provider server --production
 
 # Stage 4: Production
 FROM ${baseImage} AS runner
@@ -535,3 +559,194 @@ export function resolveDockerConfig(
 		compose: docker.compose,
 	};
 }
+
+/**
+ * Generate a Dockerfile for Next.js frontend apps using standalone output.
+ * Uses turbo prune for monorepo optimization.
+ * @internal Exported for testing
+ */
+export function generateNextjsDockerfile(
+	options: FrontendDockerfileOptions,
+): string {
+	const { baseImage, port, appPath, turboPackage, packageManager } = options;
+
+	const pm = getPmConfig(packageManager);
+	const installPm = pm.install ? `RUN ${pm.install}` : '';
+
+	// For turbo builds, we can't use --frozen-lockfile because turbo prune
+	// creates a subset that may not perfectly match. Use relaxed install.
+	const turboInstallCmd = getTurboInstallCmd(packageManager);
+
+	// Use pnpm dlx for pnpm (avoids global bin dir issues in Docker)
+	const turboCmd = packageManager === 'pnpm' ? 'pnpm dlx turbo' : 'npx turbo';
+
+	return `# syntax=docker/dockerfile:1
+# Next.js standalone Dockerfile with turbo prune optimization
+
+# Stage 1: Prune monorepo
+FROM ${baseImage} AS pruner
+
+WORKDIR /app
+
+${installPm}
+
+COPY . .
+
+# Prune to only include necessary packages
+RUN ${turboCmd} prune ${turboPackage} --docker
+
+# Stage 2: Install dependencies
+FROM ${baseImage} AS deps
+
+WORKDIR /app
+
+${installPm}
+
+# Copy pruned lockfile and package.jsons
+COPY --from=pruner /app/out/${pm.lockfile} ./
+COPY --from=pruner /app/out/json/ ./
+
+# Install dependencies
+RUN --mount=type=cache,id=${pm.cacheId},target=${pm.cacheTarget} \\
+    ${turboInstallCmd}
+
+# Stage 3: Build
+FROM deps AS builder
+
+WORKDIR /app
+
+# Copy pruned source
+COPY --from=pruner /app/out/full/ ./
+
+# Set Next.js to produce standalone output
+ENV NEXT_TELEMETRY_DISABLED=1
+
+# Build the application
+RUN ${turboCmd} run build --filter=${turboPackage}
+
+# Stage 4: Production
+FROM ${baseImage} AS runner
+
+WORKDIR /app
+
+# Install tini for proper signal handling
+RUN apk add --no-cache tini
+
+# Create non-root user
+RUN addgroup --system --gid 1001 nodejs && \\
+    adduser --system --uid 1001 nextjs
+
+# Set environment
+ENV NODE_ENV=production
+ENV NEXT_TELEMETRY_DISABLED=1
+ENV PORT=${port}
+ENV HOSTNAME="0.0.0.0"
+
+# Copy static files and standalone output
+COPY --from=builder --chown=nextjs:nodejs /app/${appPath}/.next/standalone ./
+COPY --from=builder --chown=nextjs:nodejs /app/${appPath}/.next/static ./${appPath}/.next/static
+COPY --from=builder --chown=nextjs:nodejs /app/${appPath}/public ./${appPath}/public
+
+# Health check
+HEALTHCHECK --interval=30s --timeout=3s --start-period=10s --retries=3 \\
+  CMD wget -q --spider http://localhost:${port}/ || exit 1
+
+USER nextjs
+
+EXPOSE ${port}
+
+ENTRYPOINT ["/sbin/tini", "--"]
+CMD ["node", "${appPath}/server.js"]
+`;
+}
+
+/**
+ * Generate a Dockerfile for backend apps in a workspace.
+ * Uses turbo prune for monorepo optimization.
+ * @internal Exported for testing
+ */
+export function generateBackendDockerfile(
+	options: FrontendDockerfileOptions & { healthCheckPath?: string },
+): string {
+	const {
+		baseImage,
+		port,
+		appPath,
+		turboPackage,
+		packageManager,
+		healthCheckPath = '/health',
+	} = options;
+
+	const pm = getPmConfig(packageManager);
+	const installPm = pm.install ? `RUN ${pm.install}` : '';
+	const turboInstallCmd = getTurboInstallCmd(packageManager);
+	const turboCmd = packageManager === 'pnpm' ? 'pnpm dlx turbo' : 'npx turbo';
+
+	return `# syntax=docker/dockerfile:1
+# Backend Dockerfile with turbo prune optimization
+
+# Stage 1: Prune monorepo
+FROM ${baseImage} AS pruner
+
+WORKDIR /app
+
+${installPm}
+
+COPY . .
+
+# Prune to only include necessary packages
+RUN ${turboCmd} prune ${turboPackage} --docker
+
+# Stage 2: Install dependencies
+FROM ${baseImage} AS deps
+
+WORKDIR /app
+
+${installPm}
+
+# Copy pruned lockfile and package.jsons
+COPY --from=pruner /app/out/${pm.lockfile} ./
+COPY --from=pruner /app/out/json/ ./
+
+# Install dependencies
+RUN --mount=type=cache,id=${pm.cacheId},target=${pm.cacheTarget} \\
+    ${turboInstallCmd}
+
+# Stage 3: Build
+FROM deps AS builder
+
+WORKDIR /app
+
+# Copy pruned source
+COPY --from=pruner /app/out/full/ ./
+
+# Build production server using gkm
+RUN cd ${appPath} && ./node_modules/.bin/gkm build --provider server --production
+
+# Stage 4: Production
+FROM ${baseImage} AS runner
+
+WORKDIR /app
+
+RUN apk add --no-cache tini
+
+RUN addgroup --system --gid 1001 nodejs && \\
+    adduser --system --uid 1001 hono
+
+# Copy bundled server
+COPY --from=builder --chown=hono:nodejs /app/${appPath}/.gkm/server/dist/server.mjs ./
+
+ENV NODE_ENV=production
+ENV PORT=${port}
+
+HEALTHCHECK --interval=30s --timeout=3s --start-period=5s --retries=3 \\
+  CMD wget -q --spider http://localhost:${port}${healthCheckPath} || exit 1
+
+USER hono
+
+EXPOSE ${port}
+
+ENTRYPOINT ["/sbin/tini", "--"]
+CMD ["node", "server.mjs"]
+`;
+}