@docupace/pipeline 1.0.7-7.micro-cli4 → 1.0.7-7.micro-cli5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@docupace/pipeline",
-  "version": "1.0.77.micro-cli4",
+  "version": "1.0.77.micro-cli5",
   "main": "index.js",
   "type": "module",
   "bin": {

package/src/micro/cli.js

@@ -1,14 +1,13 @@
 #!/usr/bin/env node
 
 import { Command } from 'commander';
-import { publishMicroservice } from './ms-publish.js';
+//import { publishMicroservice } from './ms-publish.js';
 
 import dotenv from 'dotenv';
 import {
-  deployMicroserviceEndToEnd,
-  promoteMicroserviceImage,
-  testMicroserviceDeploy,
-  testMicroservicePublish,
+  microserviceDeployTagVersion,
+  microserviceCopyImageToEnv,
+  microserviceBuildPushImage,
 } from './ms-deploy.js';
 
 dotenv.config({ path: ['.env.pipeline.local', 'config/.env.pipeline.local'] });
@@ -17,13 +16,12 @@ const program = new Command();
 
 //const GIT_SHA = (await $`git log --pretty=format:'%h' -n 1`).stdout.trim();
 
-// Add the new publish-microservice command
 program
   .command('publish-microservice <serviceName>')
   .description('Publish a microservice Docker image with version tags')
   .option('-t, --tag <tag>', 'Version tag (defaults to BITBUCKET_TAG)')
   .action(async (serviceName, options) => {
-    await publishMicroservice(serviceName, options);
+    await microserviceBuildPushImage(serviceName, options);
   });
 
 program
@@ -32,7 +30,7 @@ program
   .option('-e, --env <environment>', 'Target environment', 'dev')
   .option('-t, --tag <tag>', 'Version tag (defaults to BITBUCKET_TAG)')
   .action(async (repoName, options) => {
-    await deployMicroserviceEndToEnd(repoName, options.env, options.tag);
+    await microserviceDeployTagVersion(repoName, options.env, options.tag);
   });
 
 program
@@ -42,7 +40,7 @@ program
   .requiredOption('-t, --to <toEnv>', 'Target environment')
   .requiredOption('-g, --tag <tag>', 'Image tag to promote')
   .action(async (repoName, options) => {
-    await promoteMicroserviceImage(
+    await microserviceCopyImageToEnv(
       repoName,
       options.from,
       options.to,
@@ -50,22 +48,4 @@ program
     );
   });
 
-program
-  .command('test-deploy-microservice <serviceName>')
-  .description('Test microservice deployment only (no image building)')
-  .option('-e, --env <environment>', 'Target environment', 'dev')
-  .option('-t, --tag <tag>', 'Version tag', 'v0.1.0')
-  .action(async (serviceName, options) => {
-    await testMicroserviceDeploy(serviceName, options.env, options.tag);
-  });
-
-program
-  .command('test-publish-microservice <serviceName>')
-  .description(
-    'Test microservice Docker build and publish only (no deployment)',
-  )
-  .action(async (serviceName) => {
-    await testMicroservicePublish(serviceName);
-  });
-
 program.parse(process.argv);

package/src/micro/ms-deploy.js

@@ -1,5 +1,5 @@
 import { $ } from '../next/logger.js';
-import { publishMicroservice } from './ms-publish.js';
+//mport { publishMicroservice } from './ms-publish.js';
 import { copy2 } from '../next/copy.js';
 import fs from 'fs';
 import path from 'path';
@@ -9,126 +9,74 @@ import path from 'path';
  * @param {string} environment - Target environment (dev, qa, uat, stage, prod)
  * @param {string} tag - Version tag (optional, defaults to BITBUCKET_TAG)
  */
-export async function deployMicroserviceEndToEnd(
-  repoName,
-  environment = '',
-  tag = null,
-) {
-  const serviceName = String(repoName || '')
-    .split('-')
-    .pop()
-    .trim();
-  const registryUrl = process.env.JF_REGISTRY_URL || '';
-  const deployTag = tag || process.env.BITBUCKET_TAG || process.env.VERSION_TAG;
-  if (!deployTag) {
-    throw new Error(
-      'No tag provided. Set tag parameter or BITBUCKET_TAG/VERSION_TAG environment variable.',
-    );
-  }
-  console.log(`Starting ${serviceName} microservice deployment...`);
-  console.log(`Environment: ${environment}`);
-  console.log(`Tag: ${deployTag}`);
-  console.log('==========================================');
-  try {
-    // Step 1: Get Git SHA for image building
-    const gitSha = (
-      await $`git log ${deployTag} --pretty=format:'%h' -n 1`
-    ).stdout.trim();
-    console.log(`Git SHA: ${gitSha}`);
-    // Step 2: Publish Docker image with version tags
-    console.log('\nPublishing Docker image...');
-    await publishMicroservice(serviceName, {
-      tag: deployTag,
-    });
-    console.log('Docker image published successfully!');
-    // Step 3: Deploy to GitOps repository
-    console.log(`\nDeploying to ${environment} environment...`);
-    await deployMicroservice(serviceName, serviceName, environment, deployTag);
-    console.log(`Deployment to ${environment} completed successfully!`);
-    console.log(
-      `\n${serviceName} microservice deployment completed successfully!`,
-    );
-    console.log(
-      `Image: ${registryUrl}/${repoName}-${environment}-docker-local/${serviceName}:${deployTag}`,
-    );
-  } catch (error) {
-    console.error('\nDeployment failed:', error.message);
-    throw error;
-  }
-}
-/**
- * Promote microservice image between environments
- * @param {string} repoName - Name of microservice
- * @param {string} fromEnv - Source environment
- * @param {string} toEnv - Target environment
- * @param {string} tag - Image tag to promote
- */
-export async function promoteMicroserviceImage(repoName, fromEnv, toEnv, tag) {
-  const serviceName = String(repoName || '')
-    .split('-')
-    .pop()
-    .trim();
-  console.log(`Starting ${serviceName} image promotion...`);
-  console.log(`From: ${fromEnv} → To: ${toEnv}`);
-  console.log(`Tag: ${tag}`);
-  console.log('==========================================');
-  try {
-    // Step 1: Copy Docker image between registries
-    console.log('\nCopying Docker image...');
-    const repositoryName = `${repoName}`;
-    await copy2(repositoryName, fromEnv, toEnv, tag, serviceName);
-    console.log('Docker image copied successfully!');
-  } catch (error) {
-    console.error('\nImage promotion failed:', error.message);
-    throw error;
-  }
-}
-/**
- * Test deployment only (no image building)
- * @param {string} serviceName - Name of microservice
- * @param {string} environment - Target environment
- * @param {string} tag - Version tag
- */
-export async function testMicroserviceDeploy(
-  serviceName,
-  environment = 'dev',
-  tag = 'v0.1.0',
-) {
-  console.log(`Starting ${serviceName} test deployment...`);
-  console.log(`Environment: ${environment}`);
-  console.log(`Tag: ${tag}`);
-  console.log('==========================================');
-  try {
-    console.log(`\nTesting deployment to ${environment}...`);
-    await deployMicroservice(serviceName, serviceName, environment, tag);
-    console.log(`Test deployment to ${environment} completed successfully!`);
-  } catch (error) {
-    console.error('\nTest deployment failed:', error.message);
-    throw error;
-  }
-}
+// export async function deployMicroserviceEndToEnd(
+//   repoName,
+//   environment = '',
+//   tag = null,
+// ) {
+//   const serviceName = String(repoName || '')
+//     .split('-')
+//     .pop()
+//     .trim();
+//   const registryUrl = process.env.JF_REGISTRY_URL || '';
+//   const deployTag = tag || process.env.BITBUCKET_TAG || process.env.VERSION_TAG;
+//   if (!deployTag) {
+//     throw new Error(
+//       'No tag provided. Set tag parameter or BITBUCKET_TAG/VERSION_TAG environment variable.',
+//     );
+//   }
+//   console.log(`Starting ${serviceName} microservice deployment...`);
+//   console.log(`Environment: ${environment}`);
+//   console.log(`Tag: ${deployTag}`);
+//   console.log('==========================================');
+//   try {
+//     // Step 1: Get Git SHA for image building
+//     const gitSha = (
+//       await $`git log ${deployTag} --pretty=format:'%h' -n 1`
+//     ).stdout.trim();
+//     console.log(`Git SHA: ${gitSha}`);
+//     // Step 2: Publish Docker image with version tags
+//     console.log('\nPublishing Docker image...');
+//     await publishMicroservice(serviceName, {
+//       tag: deployTag,
+//     });
+//     console.log('Docker image published successfully!');
+//     // Step 3: Deploy to GitOps repository
+//     console.log(`\nDeploying to ${environment} environment...`);
+//     await deployMicroservice(serviceName, serviceName, environment, deployTag);
+//     console.log(`Deployment to ${environment} completed successfully!`);
+//     console.log(
+//       `\n${serviceName} microservice deployment completed successfully!`,
+//     );
+//     console.log(
+//       `Image: ${registryUrl}/${repoName}-${environment}-docker-local/${serviceName}:${deployTag}`,
+//     );
+//   } catch (error) {
+//     console.error('\nDeployment failed:', error.message);
+//     throw error;
+//   }
+// }
+
 /**
  * Test Docker build and publish only (no deployment)
  * @param {string} serviceName - Name of microservice
  */
-export async function testMicroservicePublish(serviceName) {
-  console.log(`Starting ${serviceName} test publish...`);
-  console.log('==========================================');
-  try {
-    const gitSha = (await $`git log --pretty=format:'%h' -n 1`).stdout.trim();
-    console.log(`Git SHA: ${gitSha}`);
-    console.log('\nTesting Docker build and publish...');
-    await publishMicroservice(gitSha, {
-      imageName: serviceName,
-    });
-    console.log('Test publish completed successfully!');
-  } catch (error) {
-    console.error('\nTest publish failed:', error.message);
-    throw error;
-  }
-}
-
-/////
+// export async function testMicroservicePublish(serviceName) {
+//   console.log(`Starting ${serviceName} test publish...`);
+//   console.log('==========================================');
+//   try {
+//     const gitSha = (await $`git log --pretty=format:'%h' -n 1`).stdout.trim();
+//     console.log(`Git SHA: ${gitSha}`);
+//     console.log('\nTesting Docker build and publish...');
+//     await publishMicroservice(gitSha, {
+//       imageName: serviceName,
+//     });
+//     console.log('Test publish completed successfully!');
+//   } catch (error) {
+//     console.error('\nTest publish failed:', error.message);
+//     throw error;
+//   }
+// }
 
 export async function deployMicroservice(
   appName,
@@ -266,3 +214,217 @@ export async function deployMicroservice(
 }
 
 export default deployMicroservice;
+
+export async function microserviceDeployTagVersion(
+  serviceName,
+  environment = '',
+  tag = null,
+) {
+  console.log(`Starting ${serviceName} test deployment...`);
+  console.log(`Environment: ${environment}`);
+  console.log(`Tag: ${tag}`);
+  console.log('==========================================');
+  try {
+    console.log(`\nTesting deployment to ${environment}...`);
+    await deployMicroservice(serviceName, serviceName, environment, tag);
+    console.log(`Test deployment to ${environment} completed successfully!`);
+  } catch (error) {
+    console.error('\nTest deployment failed:', error.message);
+    throw error;
+  }
+}
+
+export async function microserviceCopyImageToEnv(
+  repoName,
+  fromEnv,
+  toEnv,
+  tag,
+) {
+  const serviceName = String(repoName || '')
+    .split('-')
+    .pop()
+    .trim();
+  console.log(`Starting ${serviceName} image promotion...`);
+  console.log(`From: ${fromEnv} → To: ${toEnv}`);
+  console.log(`Tag: ${tag}`);
+  console.log('==========================================');
+  try {
+    // Step 1: Copy Docker image between registries
+    console.log('\nCopying Docker image...');
+    const repositoryName = `${repoName}`;
+    await copy2(repositoryName, fromEnv, toEnv, tag, serviceName);
+    console.log('Docker image copied successfully!');
+  } catch (error) {
+    console.error('\nImage promotion failed:', error.message);
+    throw error;
+  }
+}
+
+export async function microserviceBuildPushImage(serviceName, options = {}) {
+  // Use environment variables as defaults, but allow overrides
+
+  const gitSha = (await $`git log --pretty=format:'%h' -n 1 `).stdout.trim();
+
+  const config = {
+    imageName: serviceName,
+    registryUrl: options.registryUrl || process.env.JF_REGISTRY_URL,
+    repoName: options.repoName || process.env.JF_REGISTRY_REPO_NAME,
+    username: options.username || process.env.JF_REGISTRY_USER_DEV,
+    password: options.password || process.env.JF_REGISTRY_PASSWORD_DEV,
+    buildNumber: options.buildNumber || process.env.BITBUCKET_BUILD_NUMBER,
+    tag: options.tag || process.env.VERSION_TAG,
+  };
+
+  // Validate required fields
+  if (!config.imageName) {
+    throw new Error(
+      'Image name is required. Set IMAGE_NAME or APP_NAME environment variable.',
+    );
+  }
+
+  console.log('=== Docker Image Publishing Configuration ===');
+  console.log(`Image Name: ${config.imageName}`);
+  console.log(`Git SHA: ${gitSha}`);
+  console.log(`Build Number: ${config.buildNumber}`);
+  console.log(`Version Tag: ${config.tag || 'none'}`);
+  console.log(`Registry: ${config.registryUrl}/${config.repoName}`);
+  console.log('==========================================');
+
+  const registryPath = `${config.registryUrl}/${config.repoName}`;
+  const SHA_IMAGE_NAME = `${config.imageName}:sha-${gitSha}`;
+
+  // Docker login
+  await $`echo ${config.password} | docker login --username ${config.username} --password-stdin ${config.registryUrl}`;
+
+  try {
+    // Build the image if it doesn't exist locally
+    const imageExists = await checkLocalImage(SHA_IMAGE_NAME);
+    if (!imageExists) {
+      console.log(`Building Docker image ${SHA_IMAGE_NAME}...`);
+      await $`docker build -t ${SHA_IMAGE_NAME} .`;
+    }
+
+    // Array to track all tags we're pushing
+    const tagsToPush = [];
+
+    // 1. Push SHA tag
+    const shaTag = `${registryPath}/${SHA_IMAGE_NAME}`;
+    console.log(`Tagging and pushing SHA: ${shaTag}`);
+    await $`docker tag ${SHA_IMAGE_NAME} ${shaTag}`;
+    await $`docker push ${shaTag}`;
+    tagsToPush.push(SHA_IMAGE_NAME);
+
+    // 2. Push build number tag
+    if (config.buildNumber) {
+      const BUILD_IMAGE_NAME = `${config.imageName}:build-${config.buildNumber}`;
+      const buildTag = `${registryPath}/${BUILD_IMAGE_NAME}`;
+      console.log(`Tagging and pushing build: ${buildTag}`);
+      await $`docker tag ${SHA_IMAGE_NAME} ${buildTag}`;
+      await $`docker push ${buildTag}`;
+      tagsToPush.push(BUILD_IMAGE_NAME);
+    }
+
+    // 3. Push version tag (this is what ArgoCD needs!)
+    if (config.tag) {
+      // Handle various tag formats
+      let version = config.tag;
+
+      // If tag contains @, extract version after it
+      if (version.includes('@')) {
+        version = 'v' + version.split('@')[1];
+      }
+
+      // Ensure version starts with 'v' if it's a semver without it
+      if (/^\d+\.\d+\.\d+/.test(version) && !version.startsWith('v')) {
+        version = 'v' + version;
+      }
+
+      const VERSION_IMAGE_NAME = `${config.imageName}:${version}`;
+      const versionTag = `${registryPath}/${VERSION_IMAGE_NAME}`;
+
+      console.log(`Tagging and pushing version: ${versionTag}`);
+      await $`docker tag ${SHA_IMAGE_NAME} ${versionTag}`;
+      await $`docker push ${versionTag}`;
+      tagsToPush.push(VERSION_IMAGE_NAME);
+
+      // Also push 'latest' tag when we have a version
+      const LATEST_IMAGE_NAME = `${config.imageName}:latest`;
+      const latestTag = `${registryPath}/${LATEST_IMAGE_NAME}`;
+      console.log(`Tagging and pushing latest: ${latestTag}`);
+      await $`docker tag ${SHA_IMAGE_NAME} ${latestTag}`;
+      await $`docker push ${latestTag}`;
+      tagsToPush.push(LATEST_IMAGE_NAME);
+    }
+
+    // 4. Check for git tags at current commit
+    try {
+      const gitTags = (await $`git tag --points-at HEAD`).stdout
+        .trim()
+        .split('\n')
+        .filter(Boolean);
+
+      if (gitTags.length > 0) {
+        console.log(`Found git tags at HEAD: ${gitTags.join(', ')}`);
+
+        for (const gitTag of gitTags) {
+          // Skip if we already handled this tag above
+          if (gitTag === config.tag) continue;
+
+          let version = gitTag;
+          if (version.includes('@')) {
+            version = 'v' + version.split('@')[1];
+          }
+
+          const TAG_IMAGE_NAME = `${config.imageName}:${version}`;
+          const gitTagPath = `${registryPath}/${TAG_IMAGE_NAME}`;
+
+          console.log(`Tagging and pushing git tag: ${gitTagPath}`);
+          await $`docker tag ${SHA_IMAGE_NAME} ${gitTagPath}`;
+          await $`docker push ${gitTagPath}`;
+          tagsToPush.push(TAG_IMAGE_NAME);
+        }
+      }
+    } catch (e) {
+      console.log('No git tags found at HEAD or error checking tags', e);
+    }
+
+    console.log('\n✅ Docker image published successfully!');
+    console.log('=== Summary of pushed tags ===');
+    tagsToPush.forEach((tag) => console.log(`  ✓ ${tag}`));
+    console.log('==============================\n');
+
+    // Verify the version tag if we expect one
+    if (config.tag) {
+      const version = config.tag.includes('@')
+        ? 'v' + config.tag.split('@')[1]
+        : config.tag;
+      const expectedTag = `${registryPath}/${config.imageName}:${version}`;
+      console.log(`Verifying version tag exists: ${expectedTag}`);
+      try {
+        await $`docker manifest inspect ${expectedTag}`;
+        console.log('✅ Version tag verified in registry!');
+      } catch (e) {
+        console.error('❌ WARNING: Could not verify version tag in registry!');
+        console.error('ArgoCD may fail to pull this image.', e);
+      }
+    }
+  } catch (error) {
+    console.error('Error during image publishing:', error);
+    throw error;
+  } finally {
+    // Always logout
+    await $`docker logout ${config.registryUrl}`;
+  }
+}
+
+async function checkLocalImage(imageName) {
+  try {
+    $.verbose = false;
+    await $`docker image inspect ${imageName}`;
+    return true;
+  } catch {
+    return false;
+  } finally {
+    $.verbose = true;
+  }
+}

package/src/micro/ms-publish.js

@@ -1,4 +1,4 @@
-import { $ } from '../next/logger.js';
+//import { $ } from '../next/logger.js';
 
 /**
  * Publish Docker images for microservices with flexible naming
@@ -11,176 +11,176 @@ import { $ } from '../next/logger.js';
  * @param {string} options.password - JFrog password
  * @param {string} options.buildNumber - Build number
  */
-export async function publishMicroservice(serviceName, options = {}) {
-  // Use environment variables as defaults, but allow overrides
-
-  const gitSha = (await $`git log --pretty=format:'%h' -n 1 `).stdout.trim();
-
-  const config = {
-    imageName: serviceName,
-    registryUrl: options.registryUrl || process.env.JF_REGISTRY_URL,
-    repoName: options.repoName || process.env.JF_REGISTRY_REPO_NAME,
-    username: options.username || process.env.JF_REGISTRY_USER_DEV,
-    password: options.password || process.env.JF_REGISTRY_PASSWORD_DEV,
-    buildNumber: options.buildNumber || process.env.BITBUCKET_BUILD_NUMBER,
-    tag: options.tag || process.env.VERSION_TAG,
-  };
-
-  // Validate required fields
-  if (!config.imageName) {
-    throw new Error(
-      'Image name is required. Set IMAGE_NAME or APP_NAME environment variable.',
-    );
-  }
-
-  console.log('=== Docker Image Publishing Configuration ===');
-  console.log(`Image Name: ${config.imageName}`);
-  console.log(`Git SHA: ${gitSha}`);
-  console.log(`Build Number: ${config.buildNumber}`);
-  console.log(`Version Tag: ${config.tag || 'none'}`);
-  console.log(`Registry: ${config.registryUrl}/${config.repoName}`);
-  console.log('==========================================');
-
-  const registryPath = `${config.registryUrl}/${config.repoName}`;
-  const SHA_IMAGE_NAME = `${config.imageName}:sha-${gitSha}`;
-
-  // Docker login
-  await $`echo ${config.password} | docker login --username ${config.username} --password-stdin ${config.registryUrl}`;
-
-  try {
-    // Build the image if it doesn't exist locally
-    const imageExists = await checkLocalImage(SHA_IMAGE_NAME);
-    if (!imageExists) {
-      console.log(`Building Docker image ${SHA_IMAGE_NAME}...`);
-      await $`docker build -t ${SHA_IMAGE_NAME} .`;
-    }
-
-    // Array to track all tags we're pushing
-    const tagsToPush = [];
-
-    // 1. Push SHA tag
-    const shaTag = `${registryPath}/${SHA_IMAGE_NAME}`;
-    console.log(`Tagging and pushing SHA: ${shaTag}`);
-    await $`docker tag ${SHA_IMAGE_NAME} ${shaTag}`;
-    await $`docker push ${shaTag}`;
-    tagsToPush.push(SHA_IMAGE_NAME);
-
-    // 2. Push build number tag
-    if (config.buildNumber) {
-      const BUILD_IMAGE_NAME = `${config.imageName}:build-${config.buildNumber}`;
-      const buildTag = `${registryPath}/${BUILD_IMAGE_NAME}`;
-      console.log(`Tagging and pushing build: ${buildTag}`);
-      await $`docker tag ${SHA_IMAGE_NAME} ${buildTag}`;
-      await $`docker push ${buildTag}`;
-      tagsToPush.push(BUILD_IMAGE_NAME);
-    }
-
-    // 3. Push version tag (this is what ArgoCD needs!)
-    if (config.tag) {
-      // Handle various tag formats
-      let version = config.tag;
-
-      // If tag contains @, extract version after it
-      if (version.includes('@')) {
-        version = 'v' + version.split('@')[1];
-      }
-
-      // Ensure version starts with 'v' if it's a semver without it
-      if (/^\d+\.\d+\.\d+/.test(version) && !version.startsWith('v')) {
-        version = 'v' + version;
-      }
-
-      const VERSION_IMAGE_NAME = `${config.imageName}:${version}`;
-      const versionTag = `${registryPath}/${VERSION_IMAGE_NAME}`;
-
-      console.log(`Tagging and pushing version: ${versionTag}`);
-      await $`docker tag ${SHA_IMAGE_NAME} ${versionTag}`;
-      await $`docker push ${versionTag}`;
-      tagsToPush.push(VERSION_IMAGE_NAME);
-
-      // Also push 'latest' tag when we have a version
-      const LATEST_IMAGE_NAME = `${config.imageName}:latest`;
-      const latestTag = `${registryPath}/${LATEST_IMAGE_NAME}`;
-      console.log(`Tagging and pushing latest: ${latestTag}`);
-      await $`docker tag ${SHA_IMAGE_NAME} ${latestTag}`;
-      await $`docker push ${latestTag}`;
-      tagsToPush.push(LATEST_IMAGE_NAME);
-    }
-
-    // 4. Check for git tags at current commit
-    try {
-      const gitTags = (await $`git tag --points-at HEAD`).stdout
-        .trim()
-        .split('\n')
-        .filter(Boolean);
-
-      if (gitTags.length > 0) {
-        console.log(`Found git tags at HEAD: ${gitTags.join(', ')}`);
-
-        for (const gitTag of gitTags) {
-          // Skip if we already handled this tag above
-          if (gitTag === config.tag) continue;
-
-          let version = gitTag;
-          if (version.includes('@')) {
-            version = 'v' + version.split('@')[1];
-          }
-
-          const TAG_IMAGE_NAME = `${config.imageName}:${version}`;
-          const gitTagPath = `${registryPath}/${TAG_IMAGE_NAME}`;
-
-          console.log(`Tagging and pushing git tag: ${gitTagPath}`);
-          await $`docker tag ${SHA_IMAGE_NAME} ${gitTagPath}`;
-          await $`docker push ${gitTagPath}`;
-          tagsToPush.push(TAG_IMAGE_NAME);
-        }
-      }
-    } catch (e) {
-      console.log('No git tags found at HEAD or error checking tags', e);
-    }
-
-    console.log('\n✅ Docker image published successfully!');
-    console.log('=== Summary of pushed tags ===');
-    tagsToPush.forEach((tag) => console.log(`  ✓ ${tag}`));
-    console.log('==============================\n');
-
-    // Verify the version tag if we expect one
-    if (config.tag) {
-      const version = config.tag.includes('@')
-        ? 'v' + config.tag.split('@')[1]
-        : config.tag;
-      const expectedTag = `${registryPath}/${config.imageName}:${version}`;
-      console.log(`Verifying version tag exists: ${expectedTag}`);
-      try {
-        await $`docker manifest inspect ${expectedTag}`;
-        console.log('✅ Version tag verified in registry!');
-      } catch (e) {
-        console.error('❌ WARNING: Could not verify version tag in registry!');
-        console.error('ArgoCD may fail to pull this image.', e);
-      }
-    }
-  } catch (error) {
-    console.error('Error during image publishing:', error);
-    throw error;
-  } finally {
-    // Always logout
-    await $`docker logout ${config.registryUrl}`;
-  }
-}
-
-async function checkLocalImage(imageName) {
-  try {
-    $.verbose = false;
-    await $`docker image inspect ${imageName}`;
-    return true;
-  } catch {
-    return false;
-  } finally {
-    $.verbose = true;
-  }
-}
-
-// Backward compatibility wrapper
-export async function publishWithDefaults(gitSha) {
-  return publishMicroservice(gitSha);
-}
+// export async function publishMicroservice(serviceName, options = {}) {
+//   // Use environment variables as defaults, but allow overrides
+
+//   const gitSha = (await $`git log --pretty=format:'%h' -n 1 `).stdout.trim();
+
+//   const config = {
+//     imageName: serviceName,
+//     registryUrl: options.registryUrl || process.env.JF_REGISTRY_URL,
+//     repoName: options.repoName || process.env.JF_REGISTRY_REPO_NAME,
+//     username: options.username || process.env.JF_REGISTRY_USER_DEV,
+//     password: options.password || process.env.JF_REGISTRY_PASSWORD_DEV,
+//     buildNumber: options.buildNumber || process.env.BITBUCKET_BUILD_NUMBER,
+//     tag: options.tag || process.env.VERSION_TAG,
+//   };
+
+//   // Validate required fields
+//   if (!config.imageName) {
+//     throw new Error(
+//       'Image name is required. Set IMAGE_NAME or APP_NAME environment variable.',
+//     );
+//   }
+
+//   console.log('=== Docker Image Publishing Configuration ===');
+//   console.log(`Image Name: ${config.imageName}`);
+//   console.log(`Git SHA: ${gitSha}`);
+//   console.log(`Build Number: ${config.buildNumber}`);
+//   console.log(`Version Tag: ${config.tag || 'none'}`);
+//   console.log(`Registry: ${config.registryUrl}/${config.repoName}`);
+//   console.log('==========================================');
+
+//   const registryPath = `${config.registryUrl}/${config.repoName}`;
+//   const SHA_IMAGE_NAME = `${config.imageName}:sha-${gitSha}`;
+
+//   // Docker login
+//   await $`echo ${config.password} | docker login --username ${config.username} --password-stdin ${config.registryUrl}`;
+
+//   try {
+//     // Build the image if it doesn't exist locally
+//     const imageExists = await checkLocalImage(SHA_IMAGE_NAME);
+//     if (!imageExists) {
+//       console.log(`Building Docker image ${SHA_IMAGE_NAME}...`);
+//       await $`docker build -t ${SHA_IMAGE_NAME} .`;
+//     }
+
+//     // Array to track all tags we're pushing
+//     const tagsToPush = [];
+
+//     // 1. Push SHA tag
+//     const shaTag = `${registryPath}/${SHA_IMAGE_NAME}`;
+//     console.log(`Tagging and pushing SHA: ${shaTag}`);
+//     await $`docker tag ${SHA_IMAGE_NAME} ${shaTag}`;
+//     await $`docker push ${shaTag}`;
+//     tagsToPush.push(SHA_IMAGE_NAME);
+
+//     // 2. Push build number tag
+//     if (config.buildNumber) {
+//       const BUILD_IMAGE_NAME = `${config.imageName}:build-${config.buildNumber}`;
+//       const buildTag = `${registryPath}/${BUILD_IMAGE_NAME}`;
+//       console.log(`Tagging and pushing build: ${buildTag}`);
+//       await $`docker tag ${SHA_IMAGE_NAME} ${buildTag}`;
+//       await $`docker push ${buildTag}`;
+//       tagsToPush.push(BUILD_IMAGE_NAME);
+//     }
+
+//     // 3. Push version tag (this is what ArgoCD needs!)
+//     if (config.tag) {
+//       // Handle various tag formats
+//       let version = config.tag;
+
+//       // If tag contains @, extract version after it
+//       if (version.includes('@')) {
+//         version = 'v' + version.split('@')[1];
+//       }
+
+//       // Ensure version starts with 'v' if it's a semver without it
+//       if (/^\d+\.\d+\.\d+/.test(version) && !version.startsWith('v')) {
+//         version = 'v' + version;
+//       }
+
+//       const VERSION_IMAGE_NAME = `${config.imageName}:${version}`;
+//       const versionTag = `${registryPath}/${VERSION_IMAGE_NAME}`;
+
+//       console.log(`Tagging and pushing version: ${versionTag}`);
+//       await $`docker tag ${SHA_IMAGE_NAME} ${versionTag}`;
+//       await $`docker push ${versionTag}`;
+//       tagsToPush.push(VERSION_IMAGE_NAME);
+
+//       // Also push 'latest' tag when we have a version
+//       const LATEST_IMAGE_NAME = `${config.imageName}:latest`;
+//       const latestTag = `${registryPath}/${LATEST_IMAGE_NAME}`;
+//       console.log(`Tagging and pushing latest: ${latestTag}`);
+//       await $`docker tag ${SHA_IMAGE_NAME} ${latestTag}`;
+//       await $`docker push ${latestTag}`;
+//       tagsToPush.push(LATEST_IMAGE_NAME);
+//     }
+
+//     // 4. Check for git tags at current commit
+//     try {
+//       const gitTags = (await $`git tag --points-at HEAD`).stdout
+//         .trim()
+//         .split('\n')
+//         .filter(Boolean);
+
+//       if (gitTags.length > 0) {
+//         console.log(`Found git tags at HEAD: ${gitTags.join(', ')}`);
+
+//         for (const gitTag of gitTags) {
+//           // Skip if we already handled this tag above
+//           if (gitTag === config.tag) continue;
+
+//           let version = gitTag;
+//           if (version.includes('@')) {
+//             version = 'v' + version.split('@')[1];
+//           }
+
+//           const TAG_IMAGE_NAME = `${config.imageName}:${version}`;
+//           const gitTagPath = `${registryPath}/${TAG_IMAGE_NAME}`;
+
+//           console.log(`Tagging and pushing git tag: ${gitTagPath}`);
+//           await $`docker tag ${SHA_IMAGE_NAME} ${gitTagPath}`;
+//           await $`docker push ${gitTagPath}`;
+//           tagsToPush.push(TAG_IMAGE_NAME);
+//         }
+//       }
+//     } catch (e) {
+//       console.log('No git tags found at HEAD or error checking tags', e);
+//     }
+
+//     console.log('\n✅ Docker image published successfully!');
+//     console.log('=== Summary of pushed tags ===');
+//     tagsToPush.forEach((tag) => console.log(`  ✓ ${tag}`));
+//     console.log('==============================\n');
+
+//     // Verify the version tag if we expect one
+//     if (config.tag) {
+//       const version = config.tag.includes('@')
+//         ? 'v' + config.tag.split('@')[1]
+//         : config.tag;
+//       const expectedTag = `${registryPath}/${config.imageName}:${version}`;
+//       console.log(`Verifying version tag exists: ${expectedTag}`);
+//       try {
+//         await $`docker manifest inspect ${expectedTag}`;
+//         console.log('✅ Version tag verified in registry!');
+//       } catch (e) {
+//         console.error('❌ WARNING: Could not verify version tag in registry!');
+//         console.error('ArgoCD may fail to pull this image.', e);
+//       }
+//     }
+//   } catch (error) {
+//     console.error('Error during image publishing:', error);
+//     throw error;
+//   } finally {
+//     // Always logout
+//     await $`docker logout ${config.registryUrl}`;
+//   }
+// }
+
+// async function checkLocalImage(imageName) {
+//   try {
+//     $.verbose = false;
+//     await $`docker image inspect ${imageName}`;
+//     return true;
+//   } catch {
+//     return false;
+//   } finally {
+//     $.verbose = true;
+//   }
+// }
+
+// // Backward compatibility wrapper
+// export async function publishWithDefaults(gitSha) {
+//   return publishMicroservice(gitSha);
+// }