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

package/package.json

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

package/src/micro/ms-deploy.js

@@ -271,7 +271,6 @@ export async function microserviceBuildPushImage(repoName, options = {}) {
     .split('-')
     .pop()
     .trim();
-  config.repoName = repoName;
   const config = {
     imageName: serviceName,
     registryUrl: options.registryUrl || process.env.JF_REGISTRY_URL,
@@ -288,26 +287,20 @@ export async function microserviceBuildPushImage(repoName, 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}/${repoName}`);
   console.log('==========================================');
 
   const registryPath = `${config.registryUrl}/${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);
+    const TAG_IMAGE_NAME = `${config.imageName}:${options.tag}`;
+    const imageExists = await checkLocalImage(TAG_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}`;
@@ -324,6 +317,11 @@ export async function microserviceBuildPushImage(repoName, options = {}) {
       console.log(`Attempting to checkout branch: ${options.tag}`);
       await $`cd ${repoName} && git checkout ${options.tag}`;
 
+      const gitSha = (
+        await $`cd ${repoName} && git log ${options.tag} --pretty=format:'%h' -n 1 `
+      ).stdout.trim();
+      const SHA_IMAGE_NAME = `${config.imageName}:sha-${gitSha}`;
+
       console.log(`Building Docker image ${SHA_IMAGE_NAME}...`);
       await $`cd ${repoName} && docker build -t ${SHA_IMAGE_NAME} .`;
     }