@turboops/cli 1.0.0-dev.612 → 1.0.0-dev.614

package/dist/index.js

@@ -2116,16 +2116,24 @@ volumes:
 \`\`\`
 
 2. Dockerfile f\xFCr jeden Service (im jeweiligen Ordner)
+   KRITISCH: IMMER --ignore-scripts bei npm ci verwenden!
 \`\`\`dockerfile
-# Multi-stage build
-FROM node:20-alpine AS builder
+# Stage 1: Dependencies
+FROM node:22-alpine AS deps
 WORKDIR /app
 COPY package*.json ./
-RUN npm ci
+# KRITISCH: --ignore-scripts verhindert husky/prepare Fehler in Docker!
+RUN npm ci --ignore-scripts
+
+# Stage 2: Builder
+FROM node:22-alpine AS builder
+WORKDIR /app
+COPY --from=deps /app/node_modules ./node_modules
 COPY . .
 RUN npm run build
 
-FROM node:20-alpine AS runner
+# Stage 3: Runner (Production)
+FROM node:22-alpine AS runner
 WORKDIR /app
 ENV NODE_ENV=production
 # Non-root user f\xFCr Sicherheit
@@ -2151,6 +2159,7 @@ coverage
 \`\`\`
 
 === WICHTIGE REGELN ===
+- KRITISCH: IMMER \`npm ci --ignore-scripts\` verwenden (verhindert husky/prepare Fehler!)
 - Pr\xFCfe die tats\xE4chliche Projektstruktur (projects/, packages/, apps/, oder flach)
 - Passe Pfade entsprechend an
 - NestJS: CMD ["node", "dist/main.js"]
@@ -2248,6 +2257,7 @@ PIPELINE-STRUKTUR:
        - if: $CI_COMMIT_BRANCH  # L\xE4uft auf ALLEN Branches!
 
 2. DEPLOY-JOBS (jeder NUR auf seinem Branch!):
+   WICHTIG: KEIN --image Flag n\xF6tig! Die CLI erkennt CI_COMMIT_SHA automatisch!
 
    deploy-dev:
      image: node:20-alpine
@@ -2255,21 +2265,21 @@ PIPELINE-STRUKTUR:
        - npm install -g @turboops/cli
        - turbo config set token \${TURBOOPS_TOKEN}
      script:
-       - turbo deploy dev --image registry.turbo-ops.de/${projectSlug}:\${CI_COMMIT_SHA} --wait
+       - turbo deploy dev --wait  # CLI erkennt Image automatisch via CI_COMMIT_SHA
      rules:
        - if: $CI_COMMIT_BRANCH == "dev"  # NUR auf dev Branch!
      needs: [build]
 
    deploy-test:
      script:
-       - turbo deploy test --wait  # Kein --image, Auto-Promotion von dev
+       - turbo deploy test --wait
      rules:
        - if: $CI_COMMIT_BRANCH == "test"  # NUR auf test Branch!
      needs: [deploy-dev]
 
    deploy-prod:
      script:
-       - turbo deploy prod --wait  # Kein --image, Auto-Promotion von test
+       - turbo deploy prod --wait
      rules:
        - if: $CI_COMMIT_BRANCH == "main"  # NUR auf main Branch!
          when: manual
@@ -2278,7 +2288,7 @@ PIPELINE-STRUKTUR:
 WICHTIG:
 - Der Build l\xE4uft auf ALLEN Branches (dev, test, main)
 - Jeder Deploy-Job l\xE4uft NUR auf seinem zugeordneten Branch
-- --image nur bei deploy-dev (erste Stage), danach Auto-Promotion
+- KEIN --image Flag n\xF6tig - CLI erkennt CI_COMMIT_SHA/GITHUB_SHA automatisch
 - Registry-URL: registry.turbo-ops.de/${projectSlug}
 - Secrets ben\xF6tigt: TURBOOPS_TOKEN
 
@@ -2302,17 +2312,58 @@ Erstelle die Datei "${pipelineFile}".`;
 // src/commands/deploy.ts
 import { Command as Command4 } from "commander";
 import chalk6 from "chalk";
-var deployCommand = new Command4("deploy").description("Trigger a deployment (for CI/CD pipelines)").argument("<environment>", "Environment slug (e.g., production, staging)").option("-i, --image <tag>", "Docker image tag to deploy").option("-w, --wait", "Wait for deployment to complete", true).option("--no-wait", "Do not wait for deployment to complete").option(
+var REGISTRY_URL = "registry.turbo-ops.de";
+function detectCiCommitSha() {
+  if (process.env.CI_COMMIT_SHA) {
+    return process.env.CI_COMMIT_SHA;
+  }
+  if (process.env.GITHUB_SHA) {
+    return process.env.GITHUB_SHA;
+  }
+  if (process.env.BITBUCKET_COMMIT) {
+    return process.env.BITBUCKET_COMMIT;
+  }
+  if (process.env.BUILD_SOURCEVERSION) {
+    return process.env.BUILD_SOURCEVERSION;
+  }
+  if (process.env.CIRCLE_SHA1) {
+    return process.env.CIRCLE_SHA1;
+  }
+  if (process.env.GIT_COMMIT) {
+    return process.env.GIT_COMMIT;
+  }
+  return null;
+}
+function detectCiEnvironment() {
+  if (process.env.GITLAB_CI) return "GitLab CI";
+  if (process.env.GITHUB_ACTIONS) return "GitHub Actions";
+  if (process.env.BITBUCKET_PIPELINES) return "Bitbucket Pipelines";
+  if (process.env.TF_BUILD) return "Azure DevOps";
+  if (process.env.CIRCLECI) return "CircleCI";
+  if (process.env.JENKINS_URL) return "Jenkins";
+  return null;
+}
+var deployCommand = new Command4("deploy").description("Trigger a deployment (for CI/CD pipelines)").argument("<environment>", "Environment slug (e.g., production, staging)").option("-i, --image <tag>", "Docker image tag to deploy (auto-detected in CI/CD)").option("-w, --wait", "Wait for deployment to complete", true).option("--no-wait", "Do not wait for deployment to complete").option(
   "--timeout <ms>",
   "Timeout in milliseconds when waiting",
   "600000"
 ).action(async (environment, options) => {
   const { project, environment: env } = await getCommandContextWithEnvironment(environment);
   logger.header(`Deploying: ${project.name} \u2192 ${env.name}`);
+  let imageTag = options.image;
+  if (!imageTag) {
+    const commitSha = detectCiCommitSha();
+    const ciEnv = detectCiEnvironment();
+    if (commitSha && ciEnv) {
+      imageTag = `${REGISTRY_URL}/${project.slug}:${commitSha}`;
+      logger.info(`CI/CD detected (${ciEnv})`);
+      logger.info(`Auto-using image: ${imageTag}`);
+    }
+  }
   logger.info("Triggering deployment...");
   const { data: deployment, error } = await apiClient.deploy(
     env.id,
-    options.image
+    imageTag
   );
   if (error) {
     logger.error(`Failed to trigger deployment: ${error}`);
@@ -2328,7 +2379,7 @@ var deployCommand = new Command4("deploy").description("Trigger a deployment (fo
     status: deployment.status,
     environment: env.slug,
     project: project.slug,
-    imageTag: options.image || "latest"
+    imageTag: imageTag || "auto-promotion"
   });
   if (!options.wait) {
     logger.info("Deployment started. Use --wait to wait for completion.");
@@ -2583,23 +2634,55 @@ async function createDockerSetupWithAI2() {
 
 **Wichtig: TurboOps ben\xF6tigt eine docker-compose.yml auf Root-Ebene!**
 
-Anforderungen:
-1. Erstelle eine "docker-compose.yml" im Projekt-Root
-   - Services f\xFCr alle Komponenten (z.B. api, app, db wenn n\xF6tig)
+KRITISCHE ANFORDERUNGEN:
+
+1. docker-compose.yml im Projekt-Root:
+   - Services f\xFCr alle Komponenten (api, app, etc.)
    - Verwende build-Direktive mit Pfad zu den Dockerfiles
+   - KEINE version: Angabe (deprecated)
    - Health-Checks f\xFCr alle Services
-   - Production-geeignete Konfiguration
 
-2. Erstelle Dockerfiles in den entsprechenden Unterordnern
-   - Multi-stage builds f\xFCr kleine Images
-   - F\xFCr jeden Service ein eigenes Dockerfile (z.B. ./api/Dockerfile, ./app/Dockerfile)
-   - Optimiert f\xFCr Production
+2. Dockerfiles - WICHTIGE REGELN:
+   - Multi-stage builds (deps -> builder -> runner)
+   - IMMER \`npm ci --ignore-scripts\` verwenden (verhindert husky/prepare Fehler!)
+   - Non-root User f\xFCr Production
+   - Minimales Base-Image (node:22-alpine)
 
-3. Erstelle eine ".dockerignore" auf Root-Ebene
-   - node_modules, .git, etc. ausschlie\xDFen
+3. .dockerignore auf Root-Ebene:
+   - node_modules, .git, dist, .env*, *.log
 
-4. Falls Monorepo: Beachte die Projekt-Struktur
-   - Pr\xFCfe ob projects/, packages/, apps/ Ordner existieren
+4. Monorepo-Struktur beachten:
+   - Pr\xFCfe projects/, packages/, apps/ Ordner
+   - Context muss Root sein f\xFCr Monorepo-Zugriff
+
+DOCKERFILE-TEMPLATE (STRIKT EINHALTEN!):
+\`\`\`dockerfile
+# Stage 1: Dependencies
+FROM node:22-alpine AS deps
+WORKDIR /app
+COPY package*.json ./
+# WICHTIG: --ignore-scripts verhindert husky/prepare Fehler!
+RUN npm ci --ignore-scripts
+
+# Stage 2: Builder
+FROM node:22-alpine AS builder
+WORKDIR /app
+COPY --from=deps /app/node_modules ./node_modules
+COPY . .
+RUN npm run build
+
+# Stage 3: Runner (Production)
+FROM node:22-alpine AS runner
+WORKDIR /app
+ENV NODE_ENV=production
+RUN addgroup -g 1001 -S nodejs && adduser -S nodejs -u 1001
+USER nodejs
+COPY --from=builder --chown=nodejs:nodejs /app/dist ./dist
+COPY --from=builder --chown=nodejs:nodejs /app/node_modules ./node_modules
+COPY --from=builder --chown=nodejs:nodejs /app/package.json ./
+EXPOSE 3000
+CMD ["node", "dist/main.js"]
+\`\`\`
 
 Erstelle alle notwendigen Dateien.`;
   const success = await aiToolsService.runWithPrompt(tool, prompt);
@@ -2629,17 +2712,19 @@ PIPELINE-STRUKTUR:
    - Docker Images bauen mit docker-compose build
    - Images pushen mit docker-compose push
    - Registry: registry.turbo-ops.de/${projectSlug}
+   - Image-Tag: \${CI_COMMIT_SHA} (wird automatisch von CLI erkannt)
 
 2. Deploy-Jobs: Jeder Job l\xE4uft NUR auf seinem Branch!
    - deploy-dev: rules: if: $CI_COMMIT_BRANCH == "dev"
    - deploy-test: rules: if: $CI_COMMIT_BRANCH == "test"
    - deploy-prod: rules: if: $CI_COMMIT_BRANCH == "main" (when: manual)
 
-DEPLOY-BEFEHLE:
+DEPLOY-BEFEHLE (WICHTIG: KEIN --image Flag n\xF6tig!):
 - TurboOps CLI installieren: npm install -g @turboops/cli
 - Token setzen: turbo config set token \${TURBOOPS_TOKEN}
-- Deploy mit Image (nur erste Stage): turbo deploy dev --image registry.turbo-ops.de/${projectSlug}:\${CI_COMMIT_SHA} --wait
-- Deploy ohne Image (test/prod - Auto-Promotion): turbo deploy test --wait
+- Deploy: turbo deploy <stage> --wait
+
+Die CLI erkennt automatisch CI_COMMIT_SHA/GITHUB_SHA und verwendet das richtige Image!
 
 DEPENDENCIES:
 - deploy-dev needs: [build]
@@ -2667,36 +2752,71 @@ var DOCKER_SETUP_PROMPT = `Analysiere dieses Projekt und erstelle ein vollst\xE4
 
 **Wichtig: TurboOps ben\xF6tigt eine docker-compose.yml auf Root-Ebene!**
 
-Anforderungen:
-1. Erstelle eine "docker-compose.yml" im Projekt-Root
-   - Services f\xFCr alle Komponenten (z.B. api, app, db wenn n\xF6tig)
+KRITISCHE ANFORDERUNGEN:
+
+1. docker-compose.yml im Projekt-Root:
+   - Services f\xFCr alle Komponenten (api, app, etc.)
    - Verwende build-Direktive mit Pfad zu den Dockerfiles
+   - KEINE version: Angabe (deprecated)
    - Health-Checks f\xFCr alle Services
-   - Production-geeignete Konfiguration
 
-2. Erstelle Dockerfiles in den entsprechenden Unterordnern
-   - Multi-stage builds f\xFCr kleine Images
-   - F\xFCr jeden Service ein eigenes Dockerfile (z.B. ./api/Dockerfile, ./app/Dockerfile)
-   - Optimiert f\xFCr Production
+2. Dockerfiles - WICHTIGE REGELN:
+   - Multi-stage builds (deps -> builder -> runner)
+   - IMMER \`npm ci --ignore-scripts\` verwenden (verhindert husky/prepare Fehler!)
+   - Non-root User f\xFCr Production
+   - Minimales Base-Image (node:22-alpine)
 
-3. Erstelle eine ".dockerignore" auf Root-Ebene
-   - node_modules, .git, etc. ausschlie\xDFen
+3. .dockerignore auf Root-Ebene:
+   - node_modules, .git, dist, .env*, *.log
 
-4. Falls Monorepo: Beachte die Projekt-Struktur
-   - Pr\xFCfe ob projects/, packages/, apps/ Ordner existieren
+4. Monorepo-Struktur beachten:
+   - Pr\xFCfe projects/, packages/, apps/ Ordner
+   - Context muss Root sein f\xFCr Monorepo-Zugriff
 
-Beispiel docker-compose.yml Struktur:
+DOCKERFILE-TEMPLATE (STRIKT EINHALTEN!):
+\`\`\`dockerfile
+# Stage 1: Dependencies
+FROM node:22-alpine AS deps
+WORKDIR /app
+COPY package*.json ./
+# WICHTIG: --ignore-scripts verhindert husky/prepare Fehler!
+RUN npm ci --ignore-scripts
+
+# Stage 2: Builder
+FROM node:22-alpine AS builder
+WORKDIR /app
+COPY --from=deps /app/node_modules ./node_modules
+COPY . .
+RUN npm run build
+
+# Stage 3: Runner (Production)
+FROM node:22-alpine AS runner
+WORKDIR /app
+ENV NODE_ENV=production
+
+# Non-root user
+RUN addgroup -g 1001 -S nodejs && adduser -S nodejs -u 1001
+USER nodejs
+
+COPY --from=builder --chown=nodejs:nodejs /app/dist ./dist
+COPY --from=builder --chown=nodejs:nodejs /app/node_modules ./node_modules
+COPY --from=builder --chown=nodejs:nodejs /app/package.json ./
+
+EXPOSE 3000
+CMD ["node", "dist/main.js"]
+\`\`\`
+
+docker-compose.yml TEMPLATE:
 \`\`\`yaml
-version: '3.8'
 services:
   api:
     build:
       context: .
-      dockerfile: ./api/Dockerfile
+      dockerfile: projects/api/Dockerfile
     ports:
       - "3000:3000"
     healthcheck:
-      test: ["CMD", "curl", "-f", "http://localhost:3000/health"]
+      test: ["CMD", "wget", "-q", "--spider", "http://localhost:3000/health"]
       interval: 30s
       timeout: 10s
       retries: 3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@turboops/cli",
-  "version": "1.0.0-dev.612",
+  "version": "1.0.0-dev.614",
   "description": "TurboCLI - Command line interface for TurboOps deployments",
   "author": "lenne.tech GmbH",
   "license": "MIT",