@akash-chowdhury-24/deployhub 2.0.5 → 2.0.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@akash-chowdhury-24/deployhub",
-  "version": "2.0.5",
+  "version": "2.0.7",
   "description": "Zero-configuration deployment and artifact manager",
   "type": "module",
   "main": "./src/cli/index.js",

package/src/adapters/dotnet.adapter.js

@@ -2,6 +2,7 @@ import { execa } from 'execa';
 import fs from 'fs-extra';
 import path from 'path';
 import { createLogger } from '../logger/index.js';
+import { resolveDockerImageRef } from '../utils/docker-image.js';
 
 function create(config, cwd) {
   const log = createLogger('dotnet');
@@ -28,11 +29,17 @@ function create(config, cwd) {
     },
 
     async docker() {
-      if (await fs.pathExists(path.join(cwd, 'Dockerfile'))) {
-        await execa('docker', ['build', '-t', `${config.project}:latest`, '.'], {
-          cwd,
-          stdio: 'inherit',
-        });
+      if (!(await fs.pathExists(path.join(cwd, 'Dockerfile')))) {
+        return;
+      }
+      const { fullImage, latestImage } = resolveDockerImageRef(config);
+      log.info(`Building Docker image (${fullImage})...`);
+      await execa('docker', ['build', '-t', fullImage, '.'], {
+        cwd,
+        stdio: 'inherit',
+      });
+      if (fullImage !== latestImage) {
+        await execa('docker', ['tag', fullImage, latestImage], { stdio: 'pipe' });
       }
     },
   };

package/src/adapters/go.adapter.js

@@ -2,6 +2,7 @@ import { execa } from 'execa';
 import fs from 'fs-extra';
 import path from 'path';
 import { createLogger } from '../logger/index.js';
+import { resolveDockerImageRef } from '../utils/docker-image.js';
 
 function create(config, cwd) {
   const log = createLogger('go');
@@ -27,11 +28,17 @@ function create(config, cwd) {
     },
 
     async docker() {
-      if (await fs.pathExists(path.join(cwd, 'Dockerfile'))) {
-        await execa('docker', ['build', '-t', `${config.project}:latest`, '.'], {
-          cwd,
-          stdio: 'inherit',
-        });
+      if (!(await fs.pathExists(path.join(cwd, 'Dockerfile')))) {
+        return;
+      }
+      const { fullImage, latestImage } = resolveDockerImageRef(config);
+      log.info(`Building Docker image (${fullImage})...`);
+      await execa('docker', ['build', '-t', fullImage, '.'], {
+        cwd,
+        stdio: 'inherit',
+      });
+      if (fullImage !== latestImage) {
+        await execa('docker', ['tag', fullImage, latestImage], { stdio: 'pipe' });
       }
     },
   };

package/src/adapters/java.adapter.js

@@ -2,6 +2,7 @@ import { execa } from 'execa';
 import fs from 'fs-extra';
 import path from 'path';
 import { createLogger } from '../logger/index.js';
+import { resolveDockerImageRef } from '../utils/docker-image.js';
 
 function create(config, cwd) {
   const log = createLogger('java');
@@ -33,11 +34,17 @@ function create(config, cwd) {
     },
 
     async docker() {
-      if (await fs.pathExists(path.join(cwd, 'Dockerfile'))) {
-        await execa('docker', ['build', '-t', `${config.project}:latest`, '.'], {
-          cwd,
-          stdio: 'inherit',
-        });
+      if (!(await fs.pathExists(path.join(cwd, 'Dockerfile')))) {
+        return;
+      }
+      const { fullImage, latestImage } = resolveDockerImageRef(config);
+      log.info(`Building Docker image (${fullImage})...`);
+      await execa('docker', ['build', '-t', fullImage, '.'], {
+        cwd,
+        stdio: 'inherit',
+      });
+      if (fullImage !== latestImage) {
+        await execa('docker', ['tag', fullImage, latestImage], { stdio: 'pipe' });
       }
     },
   };

package/src/adapters/node.adapter.js

@@ -2,6 +2,7 @@ import { execa } from 'execa';
 import fs from 'fs-extra';
 import path from 'path';
 import { createLogger } from '../logger/index.js';
+import { resolveDockerImageRef } from '../utils/docker-image.js';
 
 /**
  * @typedef {Object} LanguageAdapter
@@ -64,12 +65,18 @@ function create(config, cwd) {
         log.warn('No Dockerfile found, skipping docker build');
         return;
       }
-      log.info('Building Docker image...');
-      const imageName = `${config.project}:latest`;
-      await execa('docker', ['build', '-t', imageName, '.'], {
+      const { fullImage, latestImage } = resolveDockerImageRef(config);
+      log.info(`Building Docker image (${fullImage})...`);
+      await execa('docker', ['build', '-t', fullImage, '.'], {
         cwd,
         stdio: 'inherit',
       });
+      if (fullImage !== latestImage) {
+        await execa('docker', ['tag', fullImage, latestImage], {
+          cwd,
+          stdio: 'pipe',
+        });
+      }
     },
   };
 }

package/src/adapters/php.adapter.js

@@ -2,6 +2,7 @@ import { execa } from 'execa';
 import fs from 'fs-extra';
 import path from 'path';
 import { createLogger } from '../logger/index.js';
+import { resolveDockerImageRef } from '../utils/docker-image.js';
 
 function create(config, cwd) {
   const log = createLogger('php');
@@ -30,11 +31,17 @@ function create(config, cwd) {
     },
 
     async docker() {
-      if (await fs.pathExists(path.join(cwd, 'Dockerfile'))) {
-        await execa('docker', ['build', '-t', `${config.project}:latest`, '.'], {
-          cwd,
-          stdio: 'inherit',
-        });
+      if (!(await fs.pathExists(path.join(cwd, 'Dockerfile')))) {
+        return;
+      }
+      const { fullImage, latestImage } = resolveDockerImageRef(config);
+      log.info(`Building Docker image (${fullImage})...`);
+      await execa('docker', ['build', '-t', fullImage, '.'], {
+        cwd,
+        stdio: 'inherit',
+      });
+      if (fullImage !== latestImage) {
+        await execa('docker', ['tag', fullImage, latestImage], { stdio: 'pipe' });
       }
     },
   };

package/src/adapters/python.adapter.js

@@ -2,6 +2,7 @@ import { execa } from 'execa';
 import fs from 'fs-extra';
 import path from 'path';
 import { createLogger } from '../logger/index.js';
+import { resolveDockerImageRef } from '../utils/docker-image.js';
 
 function create(config, cwd) {
   const log = createLogger('python');
@@ -43,10 +44,15 @@ function create(config, cwd) {
         log.warn('No Dockerfile found, skipping');
         return;
       }
-      await execa('docker', ['build', '-t', `${config.project}:latest`, '.'], {
+      const { fullImage, latestImage } = resolveDockerImageRef(config);
+      log.info(`Building Docker image (${fullImage})...`);
+      await execa('docker', ['build', '-t', fullImage, '.'], {
         cwd,
         stdio: 'inherit',
       });
+      if (fullImage !== latestImage) {
+        await execa('docker', ['tag', fullImage, latestImage], { stdio: 'pipe' });
+      }
     },
   };
 }

package/src/adapters/rails.adapter.js

@@ -2,6 +2,7 @@ import { execa } from 'execa';
 import fs from 'fs-extra';
 import path from 'path';
 import { createLogger } from '../logger/index.js';
+import { resolveDockerImageRef } from '../utils/docker-image.js';
 
 /**
  * @param {import('../core/config.js').DeployHubConfig} config
@@ -54,11 +55,15 @@ function create(config, cwd) {
         log.warn('No Dockerfile found, skipping docker build');
         return;
       }
-      log.info('Building Docker image...');
-      await execa('docker', ['build', '-t', `${config.project}:latest`, '.'], {
+      const { fullImage, latestImage } = resolveDockerImageRef(config);
+      log.info(`Building Docker image (${fullImage})...`);
+      await execa('docker', ['build', '-t', fullImage, '.'], {
         cwd,
         stdio: 'inherit',
       });
+      if (fullImage !== latestImage) {
+        await execa('docker', ['tag', fullImage, latestImage], { stdio: 'pipe' });
+      }
     },
   };
 }

package/src/commands/init.js

@@ -13,7 +13,7 @@ import {
 import { getProjectVersion } from '../utils/version.js';
 import {
   writeWorkflowFile,
-  getRequiredSecrets,
+  getGithubSecretsChecklist,
   generateEnvExampleContent,
   addDeployhubToPackageJson,
   DEFAULT_NPM_CLI_SOURCE,
@@ -30,7 +30,10 @@ import {
   getDockerEnvSecrets,
   SSH_BASED,
 } from '../deployment/init-prompts.js';
-import { printDeploymentNextSteps } from '../deployment/deployment-env.js';
+import {
+  printDeploymentNextSteps,
+  formatSecretChecklistLine,
+} from '../deployment/deployment-env.js';
 import { confirmValueIfContainsSpaces } from '../deployment/init-helpers.js';
 
 const FRONTEND_CHOICES = [
@@ -199,6 +202,9 @@ async function generateProjectScaffold(config, environments, cwd) {
   if (dockerResult.generated) {
     console.log(chalk.gray('  • Dockerfile (auto-generated)'));
   }
+  if (dockerResult.dockerignoreGenerated) {
+    console.log(chalk.gray('  • .dockerignore (auto-generated)'));
+  }
 
   const k8sResult = await ensureKubernetesManifests(cwd, config, environments);
   if (k8sResult.generated) {
@@ -495,23 +501,34 @@ export function registerInitCommand(program) {
       );
       await fs.writeFile(envExampleDest, envExampleContent);
 
-      const secrets = getRequiredSecrets(config.storage, deploy, environments, config);
+      const secretsChecklist = getGithubSecretsChecklist(
+        config.storage,
+        deploy,
+        environments,
+        config
+      );
 
       console.log('');
       if (primaryDeployType) {
         console.log(chalk.green.bold(`✔ Config generated for ${primaryDeployType} deployment.`));
-        printDeploymentNextSteps(primaryDeployType, secrets);
+        printDeploymentNextSteps(primaryDeployType, secretsChecklist);
       } else {
         console.log(chalk.green.bold('✓ DeployHub initialized successfully!'));
         console.log('');
         console.log(chalk.bold('Next steps:'));
         console.log('  1. Copy .env.example to .env and fill in credentials');
-        if (secrets.length > 0) {
+        if (secretsChecklist.length > 0) {
           console.log('  2. Add these secrets to GitHub (Settings → Secrets):');
-          secrets.forEach((s) => console.log(`     • ${s}`));
+          secretsChecklist.forEach((item) =>
+            console.log(`     ${formatSecretChecklistLine(item)}`)
+          );
         }
-        console.log(`  ${secrets.length > 0 ? '3' : '2'}. Run ${chalk.cyan('deployhub doctor')} to verify your setup`);
-        console.log(`  ${secrets.length > 0 ? '4' : '3'}. Push to main — GitHub Actions will run ${chalk.cyan('deployhub build')} automatically`);
+        console.log(
+          `  ${secretsChecklist.length > 0 ? '3' : '2'}. Run ${chalk.cyan('deployhub doctor')} to verify your setup`
+        );
+        console.log(
+          `  ${secretsChecklist.length > 0 ? '4' : '3'}. Push to main — GitHub Actions will run ${chalk.cyan('deployhub build')} automatically`
+        );
       }
 
       console.log('');

package/src/core/stages.js

@@ -41,6 +41,8 @@ export function buildPipelineStages(config, cwd, state) {
             ctx.config.port = detected.port;
           }
         }
+        // Resolve version before docker so pipeline build and deploy share the same tag
+        ctx.config.version = await getProjectVersion(ctx.cwd);
         const scaffold = await ensureDeployScaffold(
           ctx.cwd,
           ctx.config,
@@ -118,7 +120,9 @@ export function buildPipelineStages(config, cwd, state) {
       name: 'artifact',
       enabled: (ctx) => ctx.config.artifact !== false,
       async run(ctx) {
-        ctx.config.version = await getProjectVersion(ctx.cwd);
+        if (!ctx.config.version) {
+          ctx.config.version = await getProjectVersion(ctx.cwd);
+        }
         const result = await createArtifact(
           ctx.config,
           /** @type {string[]} */ (ctx.state.deployedTargets || []),

package/src/deployment/deployment-env.js

@@ -353,6 +353,8 @@ export const DEPLOYMENT_ENV_KEYS = Object.fromEntries(
 );
 
 /**
+ * Locally required env keys for doctor method-specific checks.
+ * Excludes optional and CI-only vars.
  * @param {string} deployType
  * @param {import('../core/config.js').DeployHubConfig} [config]
  * @returns {string[]}
@@ -373,7 +375,16 @@ export function getDeploymentEnvKeys(deployType, config = null) {
 }
 
 /**
- * Required secrets for GitHub Actions (includes CI-only vars like SSH_KEY).
+ * Map a def key to the GitHub Actions secret name (SSH_KEY_PATH → SSH_KEY).
+ * @param {string} key
+ */
+function toGithubSecretKey(key) {
+  return key === 'SSH_KEY_PATH' ? 'SSH_KEY' : key;
+}
+
+/**
+ * Genuinely required secrets for doctor "Secrets" check and required checklist items.
+ * Includes CI-only vars (e.g. SSH_KEY) but NOT optional vars.
  * @param {string} deployType
  * @param {import('../core/config.js').DeployHubConfig} [config]
  * @returns {string[]}
@@ -389,14 +400,92 @@ export function getDeploymentSecretKeys(deployType, config = null) {
   for (const d of defs) {
     if (d.when === 'backend' && !isBackend) continue;
     if (d.when === 'optional') continue;
-    if (d.key === 'SSH_KEY_PATH') {
-      keys.push('SSH_KEY');
+    keys.push(toGithubSecretKey(d.key));
+  }
+
+  return [...new Set(keys)];
+}
+
+/**
+ * Broad CI-wiring list for the GitHub Actions workflow generator.
+ * Includes required, CI-only, and optional keys so `${{ secrets.X }}` is
+ * available when the user sets optional secrets — empty secrets are fine.
+ * @param {string} deployType
+ * @param {import('../core/config.js').DeployHubConfig} [config]
+ * @returns {string[]}
+ */
+export function getDeploymentWorkflowSecretKeys(deployType, config = null) {
+  const defs = DEPLOYMENT_ENV_DEFS[deployType] || [];
+  const projectType = config?.projectType || 'frontend';
+  const isBackend = projectType === 'backend' || projectType === 'both';
+
+  /** @type {string[]} */
+  const keys = [];
+
+  for (const d of defs) {
+    if (d.when === 'backend' && !isBackend) continue;
+    keys.push(toGithubSecretKey(d.key));
+  }
+
+  return [...new Set(keys)];
+}
+
+/**
+ * @typedef {{ key: string, required: boolean, note?: string }} SecretChecklistItem
+ */
+
+/**
+ * Labeled GitHub Secrets checklist entries for a single deploy method.
+ * @param {string} deployType
+ * @param {import('../core/config.js').DeployHubConfig} [config]
+ * @returns {SecretChecklistItem[]}
+ */
+export function getDeploymentSecretChecklistItems(deployType, config = null) {
+  const defs = DEPLOYMENT_ENV_DEFS[deployType] || [];
+  const projectType = config?.projectType || 'frontend';
+  const isBackend = projectType === 'backend' || projectType === 'both';
+
+  /** @type {Map<string, SecretChecklistItem>} */
+  const byKey = new Map();
+
+  for (const d of defs) {
+    if (d.when === 'backend' && !isBackend) continue;
+
+    const key = toGithubSecretKey(d.key);
+    const required = d.when !== 'optional';
+    const note =
+      d.when === 'optional'
+        ? d.optionalReason
+        : d.when === 'ci'
+          ? d.optionalReason || 'required for GitHub Actions CI (paste private key contents)'
+          : undefined;
+
+    const existing = byKey.get(key);
+    if (existing) {
+      // Prefer required if any def for this key is required
+      if (required && !existing.required) {
+        byKey.set(key, { key, required: true, note });
+      }
       continue;
     }
-    keys.push(d.key);
+
+    byKey.set(key, { key, required, note });
   }
 
-  return keys;
+  return Array.from(byKey.values());
+}
+
+/**
+ * Format a checklist item for console output.
+ * @param {SecretChecklistItem} item
+ */
+export function formatSecretChecklistLine(item) {
+  if (item.required) {
+    const note = item.note ? ` — ${item.note}` : '';
+    return `• ${item.key} (required${note})`;
+  }
+  const note = item.note ? ` — ${item.note}` : '';
+  return `• ${item.key} (optional${note})`;
 }
 
 /**
@@ -442,6 +531,7 @@ export function generateDeploymentEnvSection(
   return lines.join('\n').trimEnd();
 }
 
+
 /**
  * @param {string} key
  * @param {import('../core/config.js').DeployHubConfig} [config]
@@ -512,13 +602,15 @@ export const DEPLOYMENT_GUIDE = {
     ],
     automates: [
       'Generates config, workflow, and .env.example for registry and image settings.',
+      'Generates a starter Dockerfile and .dockerignore when missing.',
       'Tests Docker daemon connectivity during init.',
-      'Builds and runs containers via docker compose during deploy.',
+      'Builds the image once during the pipeline docker stage, then reuses it on deploy.',
     ],
     after: [
-      'Copy .env.example to .env and set DOCKER_IMAGE_NAME (and registry creds if private).',
-      'If using a remote Docker host, set DOCKER_HOST and TLS cert paths in .env.',
-      'Add the same values as GitHub Secrets for CI.',
+      'Copy .env.example to .env and set DOCKER_IMAGE_NAME (required — e.g. myuser/myapp).',
+      'Optional in .env: DOCKER_IMAGE_TAG, DOCKER_REGISTRY_URL, DOCKER_HOST, DOCKER_TLS_VERIFY, DOCKER_CERT_PATH.',
+      'If using a private registry: also set DOCKER_REGISTRY_USERNAME and DOCKER_REGISTRY_TOKEN.',
+      'Add the GitHub Secrets listed below (Settings → Secrets and variables → Actions). Local .env is NOT used by GitHub Actions — doctor only checks your machine.',
       'Run deployhub doctor to verify Docker is reachable.',
       'git push origin main to trigger your first deployment.',
     ],
@@ -612,9 +704,9 @@ export const DEPLOYMENT_GUIDE = {
 
 /**
  * @param {string} deployType
- * @param {string[]} [extraSecrets]
+ * @param {SecretChecklistItem[]} [checklist]
  */
-export function printDeploymentNextSteps(deployType, extraSecrets = []) {
+export function printDeploymentNextSteps(deployType, checklist = []) {
   const guide = DEPLOYMENT_GUIDE[deployType];
   if (!guide) return;
 
@@ -625,10 +717,10 @@ export function printDeploymentNextSteps(deployType, extraSecrets = []) {
     console.log(`    ${i + 1}. ${step}`);
   });
 
-  if (extraSecrets.length > 0) {
+  if (checklist.length > 0) {
     console.log('\n  GitHub Secrets to add (Settings → Secrets and variables → Actions):');
-    for (const s of extraSecrets) {
-      console.log(`    • ${s}`);
+    for (const item of checklist) {
+      console.log(`    ${formatSecretChecklistLine(item)}`);
     }
   }
 }