@docupace/pipeline 1.0.3-1.demo1 → 1.0.3

package/src/next/deploy.js

@@ -2,11 +2,10 @@ import fs from 'fs';
 import path from 'path';
 import yaml from 'js-yaml';
 import { $ } from 'zx';
-import lodash from 'lodash';
-import { appInfo, environmentConfig, getRepUrl } from './config.js';
-import { copy2 } from './copy.js';
-import axios from 'axios';
-import { deployCore, deployConnect } from './jenkins.js';
+
+const REPO_NAME = 'gitops-dev';
+const REPO_URL = `https://x-token-auth:${process.env.GITOPS_DEV_REP_TOKEN}@bitbucket.org/dp-cloud/${REPO_NAME}.git`;
+const GITOPS_BRANCH = 'master';
 
 /**
  * Clone the repository, read the YAML file, and return the parsed data and file paths.
@@ -14,180 +13,24 @@ import { deployCore, deployConnect } from './jenkins.js';
  * @param {string} site - The site name.
  * @returns {object} - The repository path, file path, and YAML data.
  */
+export async function readDeployConfig(application, site) {
+    const repoPath = path.join(process.cwd(), REPO_NAME);
+    const deployConfigFilePath = path.join(repoPath, `dp/${site}/${application}.values.yaml`);
 
-function getRepoLocalPath(env) {
-  const repoName = `gitops-${env}`;
-  const repoPath = path.join(process.cwd(), repoName);
-  return { repoPath, repoName };
-}
-
-async function updateAndCommitConnectVersion(
-  toEnv,
-  toSite,
-  getComparedVersion,
-  connectDeployPath,
-) {
-  const connectToEnv = toEnv == 'qa' ? 'preprod' : toEnv;
-  const filePath = path.join(
-    connectDeployPath,
-    'envs',
-    connectToEnv,
-    toSite,
-    'dock.sh',
-  );
-
-  try {
-    let content = fs.readFileSync(filePath, 'utf8');
-    content = content.replace(
-      /IMAGE_VERSION=.*/,
-      `IMAGE_VERSION=git-commit-${getComparedVersion}`,
-    );
-    fs.writeFileSync(filePath, content, 'utf8');
-
-    // Git commands to stage, commit and push changes
-    await $`cd ${connectDeployPath} && git config user.email "gitops@docupace.com"`;
-    await $`cd ${connectDeployPath} && git add .`;
-    await $`cd ${connectDeployPath} && git commit -m "Update Connect version for ${toSite} in ${toEnv} to ${getComparedVersion}" || echo "No changes to commit"`;
-    await $`cd ${connectDeployPath} && git push`;
-
-    console.log('🧹 Cleaning up...');
-    await $`rm -rf ${connectDeployPath}`;
-    console.log('✅ Cleanup complete.');
-  } catch (error) {
-    console.error('Error updating Connect version:', error);
-    throw error;
-  }
-}
-
-async function fetchLoginFooter(env, site, isNewUrl) {
-  const url = isNewUrl
-    ? environmentConfig[env].newUrl(site)
-    : environmentConfig[env].oldUrl(site);
-  const endpoint = isNewUrl ? '/connect/loginFooter' : '_ui/loginFooter';
-  return await axios.get(`${url}${endpoint}`);
-}
-
-async function compareGetConnectSiteVersions(fromEnv, fromSite, toEnv, toSite) {
-  try {
-    let fromResponse, toResponse;
-    try {
-      fromResponse = await fetchLoginFooter(fromEnv, fromSite, true);
-    } catch {
-      fromResponse = await fetchLoginFooter(fromEnv, fromSite, false);
-    }
+    console.log(`Cloning repository: ${REPO_NAME}`);
+    await $`git clone ${REPO_URL}`;
+    console.log(`Repository cloned to: ${repoPath}`);
 
+    let deployConfig;
     try {
-      toResponse = await fetchLoginFooter(toEnv, toSite, true);
-    } catch {
-      toResponse = await fetchLoginFooter(toEnv, toSite, false);
-    }
-
-    const fromMatch = fromResponse.data.match(/UI Build: ([a-f0-9]*)/);
-    const toMatch = toResponse.data.match(/UI Build: ([a-f0-9]*)/);
-
-    if (fromMatch && fromMatch[1] && toMatch && toMatch[1]) {
-      if (fromMatch[1] !== toMatch[1]) {
-        return fromMatch[1];
-      }
+        deployConfig = yaml.load(fs.readFileSync(deployConfigFilePath, 'utf8'));
+        console.log(`YAML file loaded from: ${deployConfigFilePath}`);
+    } catch (error) {
+        console.error(`Error reading YAML file: ${error.message}`);
+        process.exit(1);
     }
-    return false;
-  } catch (error) {
-    console.error('Error fetching Connect versions:', error);
-    throw error;
-  }
-}
-function getRepoLocalPathByRepoSlug(repoSlug) {
-  const repoName = `${repoSlug}`;
-  const repoPath = path.join(process.cwd(), repoName);
-  return { repoPath, repoName };
-}
-
-function cleanUpRepoPath(repoPath) {
-  // Check and handle repo directory
-  if (fs.existsSync(repoPath)) {
-    console.log(`${repoPath} directory exists. Removing it...`);
-    fs.rmSync(repoPath, {
-      recursive: true,
-      force: true,
-    });
-  }
-}
 
-export async function cloneEnvRepository(env) {
-  const { repoPath, repoName } = getRepoLocalPath(env);
-  const repoUrl = getRepUrl(repoName);
-  console.log(`Cloning repository: ${repoName}`);
-  await cleanUpRepoPath(repoPath);
-  await $`git clone --depth 1 ${repoUrl}`;
-  console.log(`Repository cloned to: ${repoPath}`);
-  return repoPath;
-}
-
-export async function cloneRepository(repoSlug) {
-  const { repoPath, repoName } = getRepoLocalPathByRepoSlug(repoSlug);
-  const repoUrl = getRepUrl(repoName);
-
-  await cleanUpRepoPath(repoPath);
-
-  console.log(`Cloning repository: ${repoName}`);
-  await $`git clone --depth 1 ${repoUrl}`;
-  console.log(`Repository cloned to: ${repoPath}`);
-  return repoPath;
-}
-
-function getConfigPath(application, env, site, name) {
-  const { repoPath } = getRepoLocalPath(env);
-  const deployConfigFilePath = path.join(
-    repoPath,
-    `dp/${site}/${application}.${name}.yaml`,
-  );
-
-  return { repoPath, deployConfigFilePath };
-}
-
-function getAppTypesFromRepo(env, site) {
-  const { repoPath } = getRepoLocalPath(env);
-  const deployConfigFilePath = path.join(repoPath, `dp/${site}`);
-  const applications = [];
-  if (fs.existsSync(deployConfigFilePath)) {
-    const files = fs.readdirSync(deployConfigFilePath);
-    files.forEach((file) => {
-      if (file.includes('.values.yaml')) {
-        const appName = file.split('.')[0];
-        applications.push(appName);
-      }
-    });
-  }
-
-  return { applications };
-}
-
-export async function readDeployConfig(application, env, site, name) {
-  const { deployConfigFilePath } = getConfigPath(application, env, site, name);
-
-  let deployConfig;
-  try {
-    deployConfig = yaml.load(fs.readFileSync(deployConfigFilePath, 'utf8'));
-    console.log(`YAML file loaded from: ${deployConfigFilePath}`);
-  } catch (error) {
-    console.error(`Error reading YAML file: ${error.message}`);
-    process.exit(1);
-  }
-
-  return { deployConfig, deployConfigFilePath };
-}
-
-export async function cloneAndReadDeployConfig(application, env, site) {
-  const repoPath = await cloneEnvRepository(env);
-
-  const { deployConfig, deployConfigFilePath } = await readDeployConfig(
-    application,
-    env,
-    site,
-    'values',
-  );
-
-  return { repoPath, deployConfigFilePath, deployConfig };
+    return { repoPath, deployConfigFilePath, deployConfig };
 }
 
 /**
@@ -197,15 +40,15 @@ export async function cloneAndReadDeployConfig(application, env, site) {
  * @returns {object} - The updated YAML data.
  */
 export function setTag(deployConfig, tag) {
-  if (deployConfig.image && deployConfig.image.tag) {
-    console.log(`Current image tag: ${deployConfig.image.tag}`);
-    deployConfig.image.tag = tag;
-    console.log(`Updated image tag to: ${deployConfig.image.tag}`);
-  } else {
-    console.error('No "image.tag" field found in the YAML file.');
-    process.exit(1);
-  }
-  return deployConfig;
+    if (deployConfig.image && deployConfig.image.tag) {
+        console.log(`Current image tag: ${deployConfig.image.tag}`);
+        deployConfig.image.tag = tag;
+        console.log(`Updated image tag to: ${deployConfig.image.tag}`);
+    } else {
+        console.error('No "image.tag" field found in the YAML file.');
+        process.exit(1);
+    }
+    return deployConfig;
 }
 
 /**
@@ -214,50 +57,35 @@ export function setTag(deployConfig, tag) {
  * @param {string} deployConfigFilePath - The path to the YAML file.
  * @param {object} deployConfig - The updated YAML data.
  */
+export async function writeDeployConfig(repoPath, deployConfigFilePath, deployConfig) {
+    try {
+        fs.writeFileSync(deployConfigFilePath, yaml.dump(deployConfig), 'utf8');
+        console.log(`✅ Updated YAML file saved at: ${deployConfigFilePath}`);
+    } catch (error) {
+        console.error(`❌ Error writing YAML file: ${error.message}`);
+        process.exit(1);
+    }
 
-export async function pushDeployConfig(repoPath, commitMessage) {
-  console.log('📌 Checking for updates to commit...');
-  // Check if there are any changes to commit
-  const status = (
-    await $`cd ${repoPath} && git status --porcelain`
-  ).stdout.trim();
-  if (!status) {
-    console.log('✅ No changes to commit. Exiting.');
-    await $`rm -rf ${repoPath}`;
-    console.log('🧹 Cleanup complete.');
-    return;
-  }
-
-  console.log('📌 Committing changes to the repository...');
-  await $`cd ${repoPath} && git config user.email "gitops@docupace.com"`;
-  await $`cd ${repoPath} && git add .`;
-  await $`cd ${repoPath} && git commit -m ${commitMessage}`;
-  await $`cd ${repoPath} && git push`;
-  console.log('✅ Changes pushed to the remote repository.');
+    console.log('📌 Checking for updates to commit...');
+    // Check if there are any changes to commit
+    const status = (await $`cd ${repoPath} && git status --porcelain`).stdout.trim();
+    if (!status) {
+        console.log('✅ No changes to commit. Exiting.');
+        await $`rm -rf ${repoPath}`;
+        console.log('🧹 Cleanup complete.');
+        return;
+    }
 
-  console.log('🧹 Cleaning up...');
-  await $`rm -rf ${repoPath}`;
-  console.log('✅ Cleanup complete.');
-}
+    console.log('📌 Committing changes to the repository...');
+    await $`cd ${repoPath} && git config user.email "gitops@docupace.com"`;
+    await $`cd ${repoPath} && git add ${deployConfigFilePath}`;
+    await $`cd ${repoPath} && git commit -m "Update image tag to ${deployConfig.image.tag}"`;
+    await $`cd ${repoPath} && git push origin ${GITOPS_BRANCH}`;
+    console.log('✅ Changes pushed to the remote repository.');
 
-function writeDeployConfig(deployConfigFilePath, deployConfig) {
-  try {
-    fs.writeFileSync(deployConfigFilePath, yaml.dump(deployConfig), 'utf8');
-    console.log(`✅ Updated YAML file saved at: ${deployConfigFilePath}`);
-  } catch (error) {
-    console.error(`❌ Error writing YAML file: ${error.message}`);
-    process.exit(1);
-  }
-}
-
-export async function writeAndPushDeployConfig(
-  repoPath,
-  deployConfigFilePath,
-  deployConfig,
-  commitMessage,
-) {
-  writeDeployConfig(deployConfigFilePath, deployConfig);
-  await pushDeployConfig(repoPath, commitMessage);
+    console.log('🧹 Cleaning up...');
+    await $`rm -rf ${repoPath}`;
+    console.log('✅ Cleanup complete.');
 }
 
 /**
@@ -267,266 +95,34 @@ export async function writeAndPushDeployConfig(
  */
 
 async function getDeployTag() {
-  const gitTag = (
-    await $`git tag --points-at HEAD | grep '^v' | head -n 1`
-  ).stdout.trim();
-  const deployTag = gitTag || `build-${process.env.BITBUCKET_BUILD_NUMBER}`;
-  return deployTag;
+    const gitTag = (await $`git tag --points-at HEAD | grep '^v' | head -n 1`).stdout.trim()
+    const deployTag = gitTag || `build-${process.env.BITBUCKET_BUILD_NUMBER}`;
+    return deployTag;
 }
 
 export async function deployTemplate(site) {
-  const deployTag = await getDeployTag();
-  console.log(`Deploying standard template for site: ${site}`);
-  console.log(`Using deployment tag: ${deployTag}`);
-  const { repoPath, deployConfigFilePath, deployConfig } =
-    await cloneAndReadDeployConfig('graphql-server', 'dev', site);
-
-  deployConfig.graphqlServer.standardConfigRemoteBranch = deployTag;
-
-  await writeAndPushDeployConfig(
-    repoPath,
-    deployConfigFilePath,
-    deployConfig,
-    `Update template to  ${deployConfig.graphqlServer.standardConfigRemoteBranch}`,
-  );
-  console.log('Deployment completed successfully.');
-}
-
-export async function deploy(application, site) {
-  const deployTag = getDeployTag();
-
-  console.log(`Deploying application: ${application} for site: ${site}`);
-  console.log(`Using deployment tag: ${deployTag}`);
-
-  const { repoPath, deployConfigFilePath, deployConfig } =
-    await cloneAndReadDeployConfig(application, 'dev', site);
-  const updatedConfigData = setTag(deployConfig, deployTag);
-  await writeAndPushDeployConfig(
-    repoPath,
-    deployConfigFilePath,
-    updatedConfigData,
-    `Update image tag to ${deployConfig.image.tag}`,
-  );
-
-  console.log('Deployment completed successfully.');
-}
-
-async function getAppInfo(coreUrl) {
-  const url = `${coreUrl}/b2b/rest/v1/appinfo`;
-  return await axios.get(url);
-}
-
-function getBranchNameFromVersion(version) {
-  const match = version.match(/(\d+\.\d+\.[^\-]+)(?:-(\d+)-g([a-f0-9]+))?/);
-
-  if (!match) {
-    throw new Error(`Invalid version format: ${version}`);
-  }
-
-  const fullVersion = match[1]; // e.g., 24.19.19, 24.20.alpha3, etc.
-  const customBranch = match[2]; // e.g., 4, 58, or 0
-  const commitHash = match[3]; // e.g., 668edef58e, 634cf6c904, etc.
-
-  // If "alpha" is in the version or customBranch is non-zero, use the commit hash
-  if (fullVersion.includes('alpha') || (customBranch && customBranch !== '0')) {
-    return commitHash;
-  }
-
-  // Otherwise, use the full version
-  return 'v' + fullVersion;
-}
-
-async function getCoreBranchName(fromEnv, fromSite) {
-  const envConfig = environmentConfig[fromEnv];
-  const oldUrl = envConfig.oldUrl(fromSite);
-  const newUrl = envConfig.newUrl(fromSite) + '/core';
-
-  let appinfo;
-  try {
-    appinfo = await getAppInfo(oldUrl);
-  } catch {
-    try {
-      appinfo = await getAppInfo(newUrl);
-    } catch {
-      throw new Error('Cannot get app info');
-    }
-  }
-
-  const coreVersion = appinfo.data.core.version;
-  const branchName = getBranchNameFromVersion(coreVersion);
-  return branchName;
-}
-
-export async function deployApp(
-  application,
-  appDetails,
-  fromEnv,
-  fromSite,
-  toEnv,
-  toSite,
-) {
-  let changesMade = false;
-  console.log(`Processing application: ${application}`);
-
-  // Read the deployment configuration for the source environment and site
-  const { deployConfig: fromDeployConfig } = await readDeployConfig(
-    application,
-    fromEnv,
-    fromSite,
-    'values',
-  );
-
-  if (fromEnv !== toEnv) {
-    await copy2(
-      appDetails.repositoryName,
-      fromEnv,
-      toEnv,
-      fromDeployConfig.image.tag,
-    );
-  }
-
-  // Read the deployment configuration for the target environment and site
-  const {
-    deployConfig: toDeployConfig,
-    deployConfigFilePath: toDeployConfigFilePath,
-  } = await readDeployConfig(application, toEnv, toSite, 'values');
-
-  // Update target configuration using attributes specified in appInfo
-  for (const attribute of appDetails.deployAttributes) {
-    const sourceValue = lodash.get(fromDeployConfig, attribute);
-
-    if (sourceValue !== undefined) {
-      // Update the target configuration with the source value
-      lodash.set(toDeployConfig, attribute, sourceValue);
-      changesMade = true;
-    }
-  }
-
-  const {
-    deployConfig: toDeployAppConfig,
-    deployConfigFilePath: toDeployAppConfigFilePath,
-  } = await readDeployConfig(application, toEnv, toSite, 'app');
+    const deployTag = await getDeployTag();
+    console.log(`Deploying standard template for site: ${site}`);
+    console.log(`Using deployment tag: ${deployTag}`);
+    const { repoPath, deployConfigFilePath, deployConfig } = await readDeployConfig('graphql-server', site);
 
-  toDeployAppConfig.revision = fromDeployConfig.image.tag;
+    deployConfig.graphqlServer.standardConfigRemoteBranch = deployTag;
 
-  // Write updated configuration to the target YAML file
-  writeDeployConfig(toDeployConfigFilePath, toDeployConfig);
+    await writeDeployConfig(repoPath, deployConfigFilePath, deployConfig);
+    console.log('Deployment completed successfully.');
 
-  writeDeployConfig(toDeployAppConfigFilePath, toDeployAppConfig);
-  return changesMade;
 }
 
-export async function deployFromSite(
-  fromEnv,
-  fromSite,
-  toEnv,
-  toSite,
-  isDeployCore,
-  isDeployConnect,
-) {
-  if (isDeployCore === 'true') {
-    const branchName = await getCoreBranchName(fromEnv, fromSite);
 
-    const coreEnv = toEnv == 'qa' ? 'preprod' : toEnv;
-    await deployCore(coreEnv, toSite, 'true', branchName);
-
-    // To be added back when splitting between on prem and in cloud
-    /*await runPipeline('site-deploy', 'deploy-core', 'main', {
-      ENV: toEnv,
-      SITE: toSite,
-      LIQUIBASE: 'true',
-      BRANCH: branchName,
-    });*/
-  }
-
-  if (isDeployConnect === 'true') {
-    const branch = '';
-    const getComparedVersion = await compareGetConnectSiteVersions(
-      fromEnv,
-      fromSite,
-      toEnv,
-      toSite,
-    );
-    if (getComparedVersion) {
-      console.log('Version to deploy is: ', getComparedVersion);
-      const connectDeployPath = await cloneRepository('connect-deploy');
-      // update target version set to git-commit-${getCommparedVersion}}
-      await updateAndCommitConnectVersion(
-        toEnv,
-        toSite,
-        getComparedVersion,
-        connectDeployPath,
-      );
-      // save and deploy
-      const runLiquibase = true;
-      await deployConnect(toEnv, toSite, runLiquibase, branch);
-    }
-  }
-
-  // Clone repositories for source and target environments
-  const fromRepoPath = await cloneEnvRepository(fromEnv);
-  const toRepoPath =
-    toEnv === fromEnv ? fromRepoPath : await cloneEnvRepository(toEnv);
-
-  // Initialize a flag to track changes
-  let changesMade = false;
-  const applications = await getAppTypesFromRepo(toEnv, toSite);
-  console.log(applications);
-  // Iterate over applications in appInfo
-
-  let appInfoLocal = Object.fromEntries(
-    applications.applications
-      .filter((application) =>
-        Object.prototype.hasOwnProperty.call(appInfo, application),
-      )
-      .map((application) => [application, appInfo[application]]),
-  );
-
-  // let appInfoLocal = {};
-  // for (const application of applications.applications) {
-  //   if (Object.prototype.hasOwnProperty.call(appInfo, application)) {
-  //     appInfoLocal[application] = appInfo[application];
-  //   }
-  // }
-
-  if (Object.keys(appInfoLocal).length === 0) {
-    const { deployConfig: toDeployAppConfig } = await readDeployConfig(
-      fromSite,
-      toEnv,
-      toSite,
-      'app',
-    );
-
-    appInfoLocal[fromSite] = {
-      repositoryName: toDeployAppConfig.repo,
-      deployAttributes: ['image.tag'],
-    };
-  }
+export async function deploy(application, site) {
+    const deployTag = getDeployTag();
 
-  console.log('appinfoLocal', appInfoLocal);
+    console.log(`Deploying application: ${application} for site: ${site}`);
+    console.log(`Using deployment tag: ${deployTag}`);
 
-  for (const [application, appDetails] of Object.entries(appInfoLocal)) {
-    let cm = await deployApp(
-      application,
-      appDetails,
-      fromEnv,
-      fromSite,
-      toEnv,
-      toSite,
-    );
-    if (cm) {
-      changesMade = true;
-    }
-  }
+    const { repoPath, deployConfigFilePath, deployConfig } = await readDeployConfig(application, site);
+    const updatedConfigData = setTag(deployConfig, deployTag);
+    await writeDeployConfig(repoPath, deployConfigFilePath, updatedConfigData);
 
-  // Push all changes if any updates were made
-  if (changesMade) {
-    await pushDeployConfig(
-      toRepoPath,
-      `Updated deployment configurations from ${fromEnv}/${fromSite} to ${toEnv}/${toSite}`,
-    );
-    console.log('✅ All configurations updated and pushed successfully.');
-  } else {
-    console.log('✅ No changes detected. Nothing to push.');
-  }
+    console.log('Deployment completed successfully.');
 }

package/src/next/publish.js

@@ -1,48 +1,46 @@
 import { $ } from 'zx';
 
 export async function publish(GIT_SHA) {
-  const BITBUCKET_REPO_SLUG = process.env.BITBUCKET_REPO_SLUG;
-  const BUILD_IMAGE_NAME = `${BITBUCKET_REPO_SLUG}:build-${process.env.BITBUCKET_BUILD_NUMBER}`;
-  const IMAGE_NAME = `${BITBUCKET_REPO_SLUG}:sha-${GIT_SHA}`;
-  const JF_REGISTRY_FULL_URL = `${process.env.JF_REGISTRY_URL}/${process.env.JF_REGISTRY_REPO_NAME}`;
-
-  console.log(`Publishing Docker image: ${IMAGE_NAME}`);
-
-  // Docker login
-  await $`echo ${process.env.JF_REGISTRY_PASSWORD_DEV} | docker login --username ${process.env.JF_REGISTRY_USER_DEV} --password-stdin ${process.env.JF_REGISTRY_URL}`;
-
-  // Check if the image already exists
-  try {
-    await $`docker manifest inspect ${JF_REGISTRY_FULL_URL}/${IMAGE_NAME}`;
-    console.log(
-      `Tag sha-${GIT_SHA} already exists in the remote repository. Skipping push.`,
-    );
-  } catch {
-    await $`docker tag ${IMAGE_NAME} ${JF_REGISTRY_FULL_URL}/${IMAGE_NAME}`;
-    await $`docker push ${JF_REGISTRY_FULL_URL}/${IMAGE_NAME}`;
-  }
-
-  // Tag and push build image
-  await $`docker tag ${IMAGE_NAME} ${JF_REGISTRY_FULL_URL}/${BUILD_IMAGE_NAME}`;
-  await $`docker push ${JF_REGISTRY_FULL_URL}/${BUILD_IMAGE_NAME}`;
-
-  // Fetch Git tags pointing to the current HEAD
-  const gitTagsOutput = (await $`git tag --points-at HEAD`).stdout.trim();
-  const gitTags = gitTagsOutput.split('\n').filter((tag) => tag);
-
-  // Tag and push each Git tag as a Docker tag
-  if (gitTags.length > 0) {
-    console.log(`Found Git tags pointing to HEAD: ${gitTags.join(', ')}`);
-    for (const gitTag of gitTags) {
-      const dockerTag = `${JF_REGISTRY_FULL_URL}/${BITBUCKET_REPO_SLUG}:${gitTag}`;
-      console.log(`Tagging and pushing Docker image for Git tag: ${gitTag}`);
-      await $`docker tag ${IMAGE_NAME} ${dockerTag}`;
-      await $`docker push ${dockerTag}`;
+    const BITBUCKET_REPO_SLUG = process.env.BITBUCKET_REPO_SLUG;
+    const BUILD_IMAGE_NAME = `${BITBUCKET_REPO_SLUG}:build-${process.env.BITBUCKET_BUILD_NUMBER}`;
+    const IMAGE_NAME = `${BITBUCKET_REPO_SLUG}:sha-${GIT_SHA}`;
+    const JF_REGISTRY_FULL_URL = `${process.env.JF_REGISTRY_URL}/${process.env.JF_REGISTRY_REPO_NAME}`;
+
+    console.log(`Publishing Docker image: ${IMAGE_NAME}`);
+
+    // Docker login
+    await $`echo ${process.env.JF_REGISTRY_PASSWORD_DEV} | docker login --username ${process.env.JF_REGISTRY_USER_DEV} --password-stdin ${process.env.JF_REGISTRY_URL}`;
+
+    // Check if the image already exists
+    try {
+        await $`docker manifest inspect ${JF_REGISTRY_FULL_URL}/${IMAGE_NAME}`;
+        console.log(`Tag sha-${GIT_SHA} already exists in the remote repository. Skipping push.`);
+    } catch {
+        await $`docker tag ${IMAGE_NAME} ${JF_REGISTRY_FULL_URL}/${IMAGE_NAME}`;
+        await $`docker push ${JF_REGISTRY_FULL_URL}/${IMAGE_NAME}`;
     }
-  } else {
-    console.log('No Git tags found pointing to the current HEAD.');
-  }
 
-  // Docker logout
-  await $`docker logout ${process.env.JF_REGISTRY_URL}`;
+    // Tag and push build image
+    await $`docker tag ${IMAGE_NAME} ${JF_REGISTRY_FULL_URL}/${BUILD_IMAGE_NAME}`;
+    await $`docker push ${JF_REGISTRY_FULL_URL}/${BUILD_IMAGE_NAME}`;
+
+    // Fetch Git tags pointing to the current HEAD
+    const gitTagsOutput = (await $`git tag --points-at HEAD`).stdout.trim();
+    const gitTags = gitTagsOutput.split('\n').filter((tag) => tag);
+
+    // Tag and push each Git tag as a Docker tag
+    if (gitTags.length > 0) {
+        console.log(`Found Git tags pointing to HEAD: ${gitTags.join(', ')}`);
+        for (const gitTag of gitTags) {
+            const dockerTag = `${JF_REGISTRY_FULL_URL}/${BITBUCKET_REPO_SLUG}:${gitTag}`;
+            console.log(`Tagging and pushing Docker image for Git tag: ${gitTag}`);
+            await $`docker tag ${IMAGE_NAME} ${dockerTag}`;
+            await $`docker push ${dockerTag}`;
+        }
+    } else {
+        console.log('No Git tags found pointing to the current HEAD.');
+    }
+
+    // Docker logout
+    await $`docker logout ${process.env.JF_REGISTRY_URL}`;
 }