dank-ai 1.0.30 → 1.0.32

package/lib/docker/manager.js

@@ -1140,23 +1140,48 @@ class DockerManager {
     }
   }
 
+  /**
+   * Normalize Docker image name/tag components
+   * Docker allows: lowercase letters, digits, underscores, periods, and hyphens
+   * Cannot start or end with period or hyphen, max 128 chars for tags
+   */
+  normalizeDockerName(name) {
+    if (!name || typeof name !== 'string') return 'invalid';
+    const lower = String(name).toLowerCase();
+    let sanitized = lower.replace(/[^a-z0-9_.-]/g, '-');
+    sanitized = sanitized.replace(/\.{2,}/g, '.'); // Replace multiple periods with single
+    sanitized = sanitized.replace(/-{2,}/g, '-'); // Replace multiple hyphens with single
+    sanitized = sanitized.replace(/^[.-]+/, '').replace(/[.-]+$/, ''); // Remove leading/trailing . or -
+    if (!sanitized || !/^[a-z0-9]/.test(sanitized)) sanitized = `a${sanitized || ''}`;
+    if (sanitized.length > 128) sanitized = sanitized.slice(0, 128);
+    return sanitized;
+  }
+
   /**
    * Build agent-specific image
    */
   async buildAgentImage(agent, options = {}) {
-    const imageName = `dank-agent-${agent.name.toLowerCase()}`;
+    const normalizedName = this.normalizeDockerName(agent.name);
+    const imageName = `dank-agent-${normalizedName}`;
     this.logger.info(`Building image for agent: ${agent.name}`);
 
     try {
       const buildContext = await this.createAgentBuildContext(agent);
-
-      const stream = await this.docker.buildImage(buildContext, {
-        t: imageName,
-        dockerfile: "Dockerfile",
-        nocache: options.rebuild || options.noCache || false,
-      });
-
-      await this.followBuildProgress(stream, `Agent ${agent.name} build`);
+      const dockerCmd = await this.resolveDockerCommand();
+
+      const buildCommand = [
+        dockerCmd,
+        'buildx',
+        'build',
+        '--platform', 'linux/amd64',
+        '--tag', imageName,
+        '--file', path.join(buildContext, 'Dockerfile'),
+        '--load',
+        ...(options.rebuild || options.noCache ? ['--no-cache'] : []),
+        buildContext
+      ].join(' ');
+
+      await this.runCommand(buildCommand, `Agent ${agent.name} build`);
 
       this.logger.info(`Agent image '${imageName}' built successfully`);
 
@@ -1182,30 +1207,24 @@ class DockerManager {
       push = false,
     } = options;
 
-    // Normalize a Docker tag from agent name when tagByAgent is enabled
-    const normalizeTag = (name) => {
-      const lower = String(name || '').toLowerCase();
-      let sanitized = lower.replace(/[^a-z0-9_.-]/g, '-');
-      sanitized = sanitized.replace(/^-+/, '').replace(/-+$/, '');
-      if (!sanitized || !/^[a-z0-9]/.test(sanitized)) sanitized = `a${sanitized || ''}`;
-      if (sanitized.length > 128) sanitized = sanitized.slice(0, 128);
-      return sanitized;
-    };
+    // Normalize all components
+    const normalizedAgentName = this.normalizeDockerName(agent.name);
+    const normalizedTag = this.normalizeDockerName(tag);
 
     //construct full repo name
     let repoName;
     if(!tagByAgent){
-   
-      repoName = `${registry?`${registry}/`:''}${namespace?`${namespace}/`:''}${repoName}`;
+      // Per-agent repository: {registry}/{namespace}/{agent-name}
+      repoName = `${registry?`${registry}/`:''}${namespace?`${namespace}/`:''}${normalizedAgentName}`;
     }else{
+      // Common repository: {registry}/{namespace}
       repoName = `${registry?`${registry}/`:''}${namespace?`${namespace}/`:''}`;
     }
     
     repoName = repoName.replace(/\/+$/, '');
 
-
-    // Final tag selection
-    const finalTag = tagByAgent ? normalizeTag(agent.name) : tag;
+    // Final tag selection - normalize both agent name tags and user-provided tags
+    const finalTag = tagByAgent ? normalizedAgentName : normalizedTag;
     const imageName = `${repoName}:${finalTag}`;
 
     this.logger.info(
@@ -1214,54 +1233,33 @@ class DockerManager {
 
     try {
       const buildContext = await this.createAgentBuildContext(agent);
-
-      const stream = await this.docker.buildImage(buildContext, {
-        t: imageName,
-        dockerfile: "Dockerfile",
-        nocache: force,
-      });
-
-      await this.followBuildProgress(
-        stream,
-        `Production build for ${agent.name}`
-      );
+      const dockerCmd = await this.resolveDockerCommand();
+
+      const buildCommand = [
+        dockerCmd,
+        'buildx',
+        'build',
+        '--platform', 'linux/amd64',
+        '--tag', imageName,
+        '--file', path.join(buildContext, 'Dockerfile'),
+        ...(push ? ['--push'] : ['--load']),
+        ...(force ? ['--no-cache'] : []),
+        buildContext
+      ].join(' ');
+
+      await this.runCommand(buildCommand, `Production build for ${agent.name}`);
 
       this.logger.info(`Production image '${imageName}' built successfully`);
+      if (push) {
+        this.logger.info(`Successfully pushed image: ${imageName}`);
+      }
 
       // Clean up build context
       await fs.remove(buildContext);
 
-      let pushed = false;
-
-      // Push to registry if requested (use docker CLI for reliability)
-      if (push) {
-        const dockerCmd = await this.resolveDockerCommand();
-        const maxAttempts = 3;
-        for (let attempt = 1; attempt <= maxAttempts; attempt++) {
-          try {
-            this.logger.info(`Pushing image to registry (attempt ${attempt}/${maxAttempts}): ${imageName}`);
-            await this.runCommand(`${dockerCmd} push "${imageName}"`, `Docker push ${imageName}`);
-            this.logger.info(`Successfully pushed image: ${imageName}`);
-            pushed = true;
-            break;
-          } catch (pushError) {
-            const msg = pushError?.message || '';
-            this.logger.warn(`Push attempt ${attempt} failed: ${msg}`);
-            if (msg.match(/denied|unauthorized|authentication required/i)) {
-              this.logger.warn("Authentication issue detected. Please ensure you're logged in: docker login <registry>");
-              break; // don't retry auth failures automatically
-            }
-            if (attempt < maxAttempts) {
-              await this.sleep(2000 * attempt);
-              continue;
-            }
-          }
-        }
-      }
-
       return {
         imageName,
-        pushed,
+        pushed: push,
       };
     } catch (error) {
       throw new Error(`Failed to build production image: ${error.message}`);
@@ -1623,20 +1621,8 @@ module.exports = {
 
     await fs.writeFile(path.join(agentCodeDir, "index.js"), agentCode);
 
-    // Create tarball
-    const tarPath = path.join(
-      __dirname,
-      `../../.agent-${agent.name}-context.tar`
-    );
-    await tar.create(
-      {
-        file: tarPath,
-        cwd: contextDir,
-      },
-      ["."]
-    );
-
-    return tarPath;
+    // Return directory path (CLI build commands work with directories directly)
+    return contextDir;
   }
 
   /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dank-ai",
-  "version": "1.0.30",
+  "version": "1.0.32",
   "description": "Dank Agent Service - Docker-based AI agent orchestration platform",
   "main": "lib/index.js",
   "exports": {