@akash-chowdhury-24/deployhub 2.0.4 → 2.0.6

package/README.md

@@ -185,6 +185,8 @@ The wizard asks the same core questions for every setup:
 - `.github/workflows/deployhub.yml` — CI pipeline
 - `.env.example` — list of env vars you may need
 - `nginx.conf` — auto-generated if frontend deploys to SSH
+- `Dockerfile` — auto-generated if missing and you chose Docker or Kubernetes deploy (your existing `Dockerfile` is never overwritten)
+- `k8s/deployment.yaml` and `k8s/service.yaml` — auto-generated if missing and you chose Kubernetes deploy (existing manifests are never overwritten)
 
 ---
 
@@ -596,7 +598,7 @@ DeployHub supports six deployment targets. Pick based on what infrastructure you
 | **ec2** | AWS users with an existing EC2 instance | Running EC2 instance, security group, key pair |
 | **azure-vm** | Azure users with an existing virtual machine | Running Azure VM, NSG allowing SSH |
 | **gcp-vm** | GCP users with an existing Compute Engine VM | Running VM, firewall rule for SSH, metadata SSH key |
-| **kubernetes** | Teams with an existing K8s cluster | Cluster, kubectl access, manifests in repo |
+| **kubernetes** | Teams with an existing K8s cluster | Cluster, kubectl access; manifests auto-generated if missing |
 
 ---
 
@@ -675,10 +677,11 @@ DeployHub detects whether the server uses Debian-style `sites-available` or RHEL
 
 **Prerequisites:**
 - [ ] Docker installed (`docker --version` works)
-- [ ] `Dockerfile` or `docker-compose.yml` in project
 - [ ] Registry account if pushing private images
+- [ ] `docker-compose.yml` in project if you use multi-service Compose (not auto-generated)
 
 **What DeployHub automates:**
+- Starter `Dockerfile` at project root when none exists (framework-aware; skipped if you already have one)
 - `.env.example` for image name, registry, remote `DOCKER_HOST`
 - Docker daemon connectivity test during `init`
 - `docker compose up` or build/push/run during deploy
@@ -812,11 +815,12 @@ DeployHub detects whether the server uses Debian-style `sites-available` or RHEL
 
 **Prerequisites:**
 - [ ] Existing Kubernetes cluster (DeployHub does not provision clusters)
-- [ ] `kubectl` installed and configured
-- [ ] Kubernetes manifests (`.yaml` or `k8s/` directory) in your repo
+- [ ] `kubectl` installed and configured on your **local machine** (for `deployhub doctor` / manual `deployhub deploy`)
 - [ ] Cluster reachable from CI (kubeconfig secret or cloud auth)
 
 **What DeployHub automates:**
+- Starter `k8s/deployment.yaml` and `k8s/service.yaml` when no manifests exist (skipped if you already have a `k8s/` directory or root-level Kubernetes YAML files)
+- GitHub Actions installs `kubectl` on the CI runner and writes kubeconfig from secrets (no local `kubectl` required for the automated push-to-main deploy path)
 - Lists `kubectl` contexts during `init` for easy selection
 - Auto-detects `~/.kube/config`
 - Complete `.env.example` for kubeconfig, context, namespace
@@ -835,6 +839,7 @@ DeployHub detects whether the server uses Debian-style `sites-available` or RHEL
 | `KUBE_CONTEXT` | Context name | `my-cluster` | `kubectl config get-contexts` |
 | `KUBE_NAMESPACE` | Target namespace | `my-app` | `kubectl get namespaces` |
 | `DOCKER_IMAGE_NAME` | Container image | `ghcr.io/org/app` | Your registry |
+| `DOCKER_IMAGE_TAG` | Image tag | `1.0.0` or `latest` | Project version or your choice |
 | `KUBE_IMAGE_PULL_SECRET` | Pull secret name | `regcred` | `kubectl create secret docker-registry` |
 
 ---

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@akash-chowdhury-24/deployhub",
-  "version": "2.0.4",
+  "version": "2.0.6",
   "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/artifact/engine.js

@@ -6,6 +6,11 @@ import { createLogger } from '../logger/index.js';
 import { generateChecksums, formatChecksums } from '../utils/checksums.js';
 import { getProjectVersion } from '../utils/version.js';
 import { generateNginxConfig } from '../utils/nginx.js';
+import {
+  ensureDeployScaffold,
+  copyKubernetesManifestsIfPresent,
+  copyDeployAssetsToArtifactDir,
+} from '../utils/scaffold.js';
 import { getGeneratedByMetadata, getArtifactReadmeFooter } from '../utils/author.js';
 
 /**
@@ -143,6 +148,8 @@ async function stageFrontendArtifact(cwd, stagingDir, config) {
     await copyIfExists(cwd, stagingDir, file);
   }
 
+  await copyKubernetesManifestsIfPresent(cwd, stagingDir);
+
   const hasSshDeploy = (config.deploy || []).some(
     (envName) => config.environments[envName]?.type === 'ssh'
   );
@@ -172,6 +179,8 @@ async function stageBackendArtifact(cwd, stagingDir, config) {
     await copyIfExists(cwd, stagingDir, file);
   }
 
+  await copyKubernetesManifestsIfPresent(cwd, stagingDir);
+
   await copyDirectoryIfExists(cwd, stagingDir, 'config');
   await copyDirectoryIfExists(cwd, stagingDir, 'migrations');
 
@@ -259,6 +268,8 @@ export async function createArtifact(config, deployedTargets = [], cwd = process
 
   log.info(`Staging ${projectType} artifact...`);
 
+  await ensureDeployScaffold(cwd, config, config.environments || {}, { silent: false });
+
   if (projectType === 'both') {
     await stageFrontendArtifact(cwd, stagingDir, config);
     const backendStaging = path.join(stagingDir, 'backend');
@@ -337,6 +348,8 @@ ${getArtifactReadmeFooter()}`;
   const zipPath = path.join(artifactDir, 'artifact.zip');
   await createZip(stagingDir, zipPath);
 
+  await copyDeployAssetsToArtifactDir(stagingDir, artifactDir);
+
   const checksums = await generateChecksums(stagingDir);
   const checksumContent = formatChecksums(checksums);
   await fs.writeFile(path.join(artifactDir, 'checksums.txt'), checksumContent);

package/src/commands/init.js

@@ -20,6 +20,10 @@ import {
 } from '../utils/github-actions.js';
 import { printAuthorFooter } from '../utils/author.js';
 import { generateNginxConfig } from '../utils/nginx.js';
+import {
+  ensureDockerfile,
+  ensureKubernetesManifests,
+} from '../utils/scaffold.js';
 import {
   promptServerDeployment,
   buildServerEnvEntry,
@@ -190,6 +194,24 @@ async function generateProjectScaffold(config, environments, cwd) {
     await fs.writeFile(path.join(cwd, 'nginx.conf'), nginxConf);
     console.log(chalk.gray('  • nginx.conf (auto-generated)'));
   }
+
+  const dockerResult = await ensureDockerfile(cwd, config);
+  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) {
+    console.log(chalk.gray('  • k8s/deployment.yaml, k8s/service.yaml (auto-generated)'));
+  }
+
+  return {
+    dockerfileGenerated: dockerResult.generated,
+    kubernetesGenerated: k8sResult.generated,
+  };
 }
 
 /**
@@ -397,7 +419,7 @@ export function registerInitCommand(program) {
       }
 
       const version = await getProjectVersion(cwd);
-      const hasDocker =
+      let hasDocker =
         (detectedFrontend?.hasDocker || detectedBackend?.hasDocker) ?? false;
 
       /** @type {Record<string, unknown>} */
@@ -458,7 +480,14 @@ export function registerInitCommand(program) {
         config
       );
 
-      await generateProjectScaffold(config, environments, cwd);
+      const scaffoldResult = await generateProjectScaffold(config, environments, cwd);
+
+      if (scaffoldResult?.dockerfileGenerated) {
+        hasDocker = true;
+        config.docker = true;
+        config.pipeline.docker = true;
+        await saveConfig(config, cwd);
+      }
 
       const envExampleDest = path.join(cwd, '.env.example');
       const envExampleContent = generateEnvExampleContent(

package/src/core/stages.js

@@ -6,6 +6,7 @@ import { deployToAll } from '../deployment/index.js';
 import { sendNotifications } from '../notifications/index.js';
 import axios from 'axios';
 import { getProjectVersion } from '../utils/version.js';
+import { ensureDeployScaffold } from '../utils/scaffold.js';
 
 /**
  * @param {import('../core/config.js').DeployHubConfig} config
@@ -40,6 +41,20 @@ 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,
+          ctx.config.environments || {},
+          { silent: false }
+        );
+        if (scaffold.dockerfile) {
+          ctx.config.docker = true;
+          if (ctx.config.pipeline) {
+            ctx.config.pipeline.docker = true;
+          }
+        }
         ctx.state.framework = ctx.config.framework;
         ctx.state.projectType = ctx.config.projectType || 'frontend';
       },
@@ -105,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

@@ -323,6 +323,15 @@ export const DEPLOYMENT_ENV_DEFS = {
       example: 'ghcr.io/myorg/myapp',
       when: 'optional',
     },
+    {
+      key: 'DOCKER_IMAGE_TAG',
+      optionalReason: 'defaults to your project version, then "latest" if unset',
+      comment: [
+        'Image tag written into generated manifests and used at deploy time.',
+      ],
+      example: 'latest',
+      when: 'optional',
+    },
     {
       key: 'KUBE_IMAGE_PULL_SECRET',
       optionalReason: 'only required when pulling from a private container registry',
@@ -379,7 +388,14 @@ export function getDeploymentSecretKeys(deployType, config = null) {
 
   for (const d of defs) {
     if (d.when === 'backend' && !isBackend) continue;
-    if (d.when === 'optional') continue;
+    // Docker optional vars must still appear in CI workflow/secrets checklist —
+    // empty secrets are fine when unused; missing DOCKER_IMAGE_NAME is not.
+    if (d.when === 'optional') {
+      if (deployType === 'docker' && d.key.startsWith('DOCKER_')) {
+        keys.push(d.key);
+      }
+      continue;
+    }
     if (d.key === 'SSH_KEY_PATH') {
       keys.push('SSH_KEY');
       continue;
@@ -503,13 +519,16 @@ 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 GitHub Secrets (Settings → Secrets and variables → Actions): DOCKER_IMAGE_NAME (required). Local .env is NOT used by GitHub Actions — doctor only checks your machine.',
+      'Also add as GitHub Secrets if set locally: DOCKER_IMAGE_TAG, DOCKER_REGISTRY_URL, DOCKER_REGISTRY_USERNAME, DOCKER_REGISTRY_TOKEN, DOCKER_HOST, DOCKER_TLS_VERIFY, DOCKER_CERT_PATH.',
       'Run deployhub doctor to verify Docker is reachable.',
       'git push origin main to trigger your first deployment.',
     ],