@docupace/pipeline 1.0.7-7.micro-cli6 → 1.0.7-7.micro-cli8

package/package.json

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

package/src/micro/cli.js

@@ -20,8 +20,8 @@ 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 microserviceBuildPushImage(serviceName, options);
+  .action(async (repoName, options) => {
+    await microserviceBuildPushImage(repoName, options);
   });
 
 program

package/src/micro/ms-deploy.js

@@ -264,17 +264,20 @@ export async function microserviceCopyImageToEnv(
   }
 }
 
-export async function microserviceBuildPushImage(serviceName, options = {}) {
+export async function microserviceBuildPushImage(repoName, options = {}) {
   // Use environment variables as defaults, but allow overrides
 
-  const gitSha = (await $`git log --pretty=format:'%h' -n 1 `).stdout.trim();
-
+  const serviceName = String(repoName || '')
+    .split('-')
+    .pop()
+    .trim();
+  config.repoName = repoName;
   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,
+    repoName: repoName,
+    username: options.username || process.env.JF_REGISTRY_DEV_USERNAME,
+    password: options.password || process.env.JF_REGISTRY_DEV_PASSWORD,
     buildNumber: options.buildNumber || process.env.BITBUCKET_BUILD_NUMBER,
     tag: options.tag || process.env.VERSION_TAG,
   };
@@ -285,16 +288,18 @@ export async function microserviceBuildPushImage(serviceName, options = {}) {
       'Image name is required. Set IMAGE_NAME or APP_NAME environment variable.',
     );
   }
-
+  const gitSha = (
+    await $`git log ${options.tag} --pretty=format:'%h' -n 1 `
+  ).stdout.trim();
   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(`Registry: ${config.registryUrl}/${repoName}`);
   console.log('==========================================');
 
-  const registryPath = `${config.registryUrl}/${config.repoName}`;
+  const registryPath = `${config.registryUrl}/${repoName}`;
   const SHA_IMAGE_NAME = `${config.imageName}:sha-${gitSha}`;
 
   // Docker login
@@ -304,8 +309,23 @@ export async function microserviceBuildPushImage(serviceName, options = {}) {
     // Build the image if it doesn't exist locally
     const imageExists = await checkLocalImage(SHA_IMAGE_NAME);
     if (!imageExists) {
+      const repoUrl = `https://${process.env.BITBUCKET_USERNAME}:${process.env.BITBUCKET_APP_PASSWORD}@bitbucket.org/dp-cloud/${repoName}.git`;
+      await $`git clone --depth 1 ${repoUrl} ${repoName}`;
+
+      console.log('Checking if directory exists...');
+      await $`ls -la ${repoName}`;
+
+      console.log(`Changing to directory: ${repoName}`);
+      process.chdir(repoName);
+
+      await $`cd ${repoName} && git config user.email "pipeline@bitbucket.org"`;
+      await $`cd ${repoName} && git config user.name "Bitbucket Pipeline"`;
+
+      console.log(`Attempting to checkout branch: ${options.tag}`);
+      await $`cd ${repoName} && git checkout ${options.tag}`;
+
       console.log(`Building Docker image ${SHA_IMAGE_NAME}...`);
-      await $`docker build -t ${SHA_IMAGE_NAME} .`;
+      await $`cd ${repoName} && docker build -t ${SHA_IMAGE_NAME} .`;
     }
 
     // Array to track all tags we're pushing
@@ -320,7 +340,7 @@ export async function microserviceBuildPushImage(serviceName, options = {}) {
 
     // 2. Push build number tag
     if (config.buildNumber) {
-      const BUILD_IMAGE_NAME = `${config.imageName}:build-${config.buildNumber}`;
+      const BUILD_IMAGE_NAME = `${config.imageName}:${config.buildNumber}`;
       const buildTag = `${registryPath}/${BUILD_IMAGE_NAME}`;
       console.log(`Tagging and pushing build: ${buildTag}`);
       await $`docker tag ${SHA_IMAGE_NAME} ${buildTag}`;