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

package/package.json

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

package/src/micro/ms-deploy.js

@@ -292,18 +292,18 @@ export async function microserviceBuildPushImage(repoName, options = {}) {
   console.log(`Registry: ${config.registryUrl}/${repoName}`);
   console.log('==========================================');
 
-  const registryPath = `${config.registryUrl}/${repoName}`;
+  const registryPath = `${config.registryUrl}/${repoName}-dev-docker-local`;
   // 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 TAG_IMAGE_NAME = `${config.imageName}:${options.tag}`;
+    const TAG_IMAGE_NAME = `${registryPath}/${serviceName}:${options.tag}`;
     const imageExists = await checkLocalImage(TAG_IMAGE_NAME);
-
+    let 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}`;
+      await $`git clone --branch ${options.tag} --depth 1 ${repoUrl} ${repoName}`;
 
       console.log('Checking if directory exists...');
       await $`ls -la ${repoName}`;
@@ -315,12 +315,11 @@ export async function microserviceBuildPushImage(repoName, options = {}) {
       await $`cd ${repoName} && git config user.name "Bitbucket Pipeline"`;
 
       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}`;
+      SHA_IMAGE_NAME = `${config.imageName}:sha-${gitSha}`;
 
       console.log(`Building Docker image ${SHA_IMAGE_NAME}...`);
       await $`cd ${repoName} && docker build -t ${SHA_IMAGE_NAME} .`;