@docupace/pipeline 1.0.2-3.test5 → 1.0.2-3.test7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@docupace/pipeline",
-  "version": "1.0.23.test5",
+  "version": "1.0.23.test7",
   "description": "",
   "main": "index.js",
   "type": "module",

package/src/next/copy.js

@@ -28,3 +28,25 @@ export async function copy(application, fromEnv, toEnv, tag) {
   await $`echo ${envInfo[toEnv].jfrog.password} | docker login --username ${envInfo[toEnv].jfrog.username} --password-stdin ${jfRegistryUrl}`;
   await $`docker push ${toFullImageName}`;
 }
+
+export async function copy2(repositoryName, fromEnv, toEnv, tag) {
+  const envInfo = getEnvInfo();
+  const fromRegistry = `${jfRegistryUrl}/${repositoryName}-${fromEnv}-docker-local`;
+  const toRegistry = `${jfRegistryUrl}/${repositoryName}-${toEnv}-docker-local`;
+  const imageName = `${repositoryName}:${tag}`;
+  const fromFullImageName = `${fromRegistry}/${imageName}`;
+  const toFullImageName = `${toRegistry}/${imageName}`;
+
+  console.log(
+    `Copying Docker image: ${fromFullImageName} -> ${toFullImageName}`,
+  );
+
+  // Login to source registry
+  await $`echo ${envInfo[fromEnv].jfrog.password} | docker login --username ${envInfo[fromEnv].jfrog.username} --password-stdin ${jfRegistryUrl}`;
+  await $`docker pull ${fromFullImageName}`;
+  await $`docker tag ${fromFullImageName} ${toFullImageName}`;
+
+  // Login to target registry
+  await $`echo ${envInfo[toEnv].jfrog.password} | docker login --username ${envInfo[toEnv].jfrog.username} --password-stdin ${jfRegistryUrl}`;
+  await $`docker push ${toFullImageName}`;
+}

package/src/next/deploy.js

@@ -4,7 +4,7 @@ import yaml from 'js-yaml';
 import { $ } from 'zx';
 import lodash from 'lodash';
 import { appInfo, environmentConfig, getRepUrl } from './config.js';
-import { copy } from './copy.js';
+import { copy2 } from './copy.js';
 import axios from 'axios';
 import { deployCore } from './jenkins.js';
 
@@ -302,7 +302,12 @@ export async function deployApp(
   );
 
   if (fromEnv !== toEnv) {
-    await copy(application, fromEnv, toEnv, fromDeployConfig.image.tag);
+    await copy2(
+      appDetails.repositoryName,
+      fromEnv,
+      toEnv,
+      fromDeployConfig.image.tag,
+    );
   }
 
   // Read the deployment configuration for the target environment and site
@@ -400,7 +405,7 @@ export async function deployFromSite(
 
   console.log('appinfoLocal', appInfoLocal);
 
-  for (const [application, appDetails] of Object.entries(appInfo)) {
+  for (const [application, appDetails] of Object.entries(appInfoLocal)) {
     let cm = await deployApp(
       application,
       appDetails,