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

package/src/next/connect.js

@@ -1,199 +1,187 @@
 import 'zx/globals'; // npm i zx
 import fs from 'fs-extra';
 import path from 'path';
-import axios from 'axios';
 import { $ } from 'zx';
 
-
-
-import {
-  cloneEnvRepository,
-  cloneRepository
-} from './deploy.js';
-
-
 import { getVaultSecrets } from '../auth0/vault.js';
 
-import {
-  getVaultSecretsConfigs,
-  environmentConfig
-} from './config.js';
-
-process.env.COMMON_VAULT_PATH = process.env.COMMON_VAULT_PATH || 'secret/data/common/config';
+process.env.COMMON_VAULT_PATH =
+  process.env.COMMON_VAULT_PATH || 'secret/data/common/config';
 process.env.VAULT_SKIP_VERIFY = process.env.VAULT_SKIP_VERIFY || 'true';
 process.env.CONNECT_DIR = process.env.CONNECT_DIR || 'connect';
 const vaultToken = process.env.VAULT_TOKEN;
 const vaultAddr = process.env.VAULT_ADDR;
 
-const connectUIEnvMap= {
-  'dev': 'dev',
-  'qa': 'preprod',
-  'stg': 'stg',
-  'uat': 'uat',
-  'prd': 'prod-las'
+const connectUIEnvMap = {
+  dev: 'dev',
+  qa: 'preprod',
+  stg: 'stg',
+  uat: 'uat',
+  prd: 'prod-las',
 };
 
 function log(msg) {
-    console.log(`[*] ${msg}`);
-  }
-  
-  /* --------------------------------
-   * 1. GIT CHECKOUT
-   * -------------------------------- */
-  async function gitCheckout(repository, destDir, branch = 'master') {
-    if (!(await fs.pathExists(destDir))) {
-      log(`Directory ${destDir} does not exist. Cloning repository...`);
-    } else {
-      log(`Directory ${destDir} exists. Removing it...`);
-      await fs.remove(destDir);
-      log(`Cloning ${destDir} repository...`);
-    }
-    
-    const username = process.env.BITBUCKET_USERNAME;
-    const password = process.env.BITBUCKET_APP_PASSWORD;
-  
-    // Construct clone command
-    const cloneUrl = `https://${username}:${password}@bitbucket.org/dp-cloud/${repository}.git`;
-  
-    log(`Perform cloning`);
-    await $`git clone --branch=${branch} --depth 1 ${cloneUrl} ${destDir}`;
+  console.log(`[*] ${msg}`);
+}
+
+/* --------------------------------
+ * 1. GIT CHECKOUT
+ * -------------------------------- */
+async function gitCheckout(repository, destDir, branch = 'master') {
+  if (!(await fs.pathExists(destDir))) {
+    log(`Directory ${destDir} does not exist. Cloning repository...`);
+  } else {
+    log(`Directory ${destDir} exists. Removing it...`);
+    await fs.remove(destDir);
+    log(`Cloning ${destDir} repository...`);
   }
-  
-  
 
+  const username = process.env.BITBUCKET_USERNAME;
+  const password = process.env.BITBUCKET_APP_PASSWORD;
 
-  
+  // Construct clone command
+  const cloneUrl = `https://${username}:${password}@bitbucket.org/dp-cloud/${repository}.git`;
+
+  log(`Perform cloning`);
+  await $`git clone --branch=${branch} --depth 1 ${cloneUrl} ${destDir}`;
+}
 
 export async function connectClone() {
-     const connectFromEnv = connectUIEnvMap[process.env.BUILD_ENVIRONMENT];
-     const connectToEnv = connectUIEnvMap[process.env.BUILD_ENVIRONMENT];
-    if (!vaultToken || !vaultAddr) {
-      console.error("Error: VAULT_TOKEN and VAULT_ADDR must be set.");
-      throw new Error("VAULT_TOKEN and VAULT_ADDR must be set.");
-    }
+  const connectFromEnv = connectUIEnvMap[process.env.BUILD_ENVIRONMENT];
+  const connectToEnv = connectUIEnvMap[process.env.BUILD_ENVIRONMENT];
+  if (!vaultToken || !vaultAddr) {
+    console.error('Error: VAULT_TOKEN and VAULT_ADDR must be set.');
+    throw new Error('VAULT_TOKEN and VAULT_ADDR must be set.');
+  }
 
-    const site = process.env.BUILD_SITE;
-    if (!site) {
-      log('Error: BUILD_SITE is not set');
-      process.exit(1);
-    }
-    const siteCommonVaultPath = `secret/data/${site}/common/config`;
-  
-  
-    // 2) getVaultSecrets
-    const secretsJson = await getVaultSecrets(siteCommonVaultPath);
-    if (!secretsJson.AUTH0_CLIENT_ID) {
-      log('Failed to retrieve secret data.');
-      process.exit(1);
-    }
-    const siteCommonSecrets = secretsJson;
-  
-    // 3) Export secrets as environment variables
-    process.env.AUTH0_CLIENT_ID = siteCommonSecrets.AUTH0_CLIENT_ID;
-    process.env.AUTH0_CLIENT_SECRET = siteCommonSecrets.AUTH0_CLIENT_SECRET;
-  
-   
-    process.env.AUTH0_REGION_DOMAIN="us.auth0.com";
-
-    log(`BUILD_ENVIRONMENT: ${connectToEnv}`);
-    log(`BUILD_SITE: ${process.env.BUILD_SITE}`);
-    log(`AUTH0_SUBDOMAIN: ${process.env.AUTH0_SUBDOMAIN}`);
-    log(`AUTH0_REGION_DOMAIN: ${process.env.AUTH0_REGION_DOMAIN}`);
-    log(`AUTH0_CLIENT_ID: ${process.env.AUTH0_CLIENT_ID}`);
-  
-    process.env.AUTH0_DOMAIN = `docupace-${process.env.BUILD_ENVIRONMENT}-${process.env.BUILD_SITE}.${process.env.AUTH0_REGION_DOMAIN}`;
-    
-
-    const projectRoot = process.cwd();
-    // 4) Clone 'connect-deploy' into CONNECT_DIR
-
-    
-    await gitCheckout('connect-deploy', process.env.CONNECT_DIR);
-    
-    await gitCheckout(`${connectToEnv}-site-settings`, `${process.env.CONNECT_DIR}/${connectToEnv}-site-settings`);
-
-    // 5) Create site clone (emulating the dock.sh call)
-    const cloneFrom = path.join(projectRoot,process.env.CONNECT_DIR,`envs`,`${connectFromEnv}/${process.env.FROM_BUILD_SITE}`);
-    const cloneTo = path.join(projectRoot,process.env.CONNECT_DIR,`envs`,`${connectToEnv}/${process.env.BUILD_SITE}`);
-
-    const connectHome = path.join(projectRoot,process.env.CONNECT_DIR);
-    if (!(await fs.pathExists(cloneFrom))) {
-      log('Clone template directory not found:');
-      process.exit(1);
-    }
-  
-  
-    if (!(await fs.pathExists(cloneTo))) {
-      log('New site does not exist. Performing cloning...');
-
-      process.env.IMAGE_VERSION=await $`cd ${cloneFrom} && grep -E '^IMAGE_VERSION=' dock.sh | cut -f2 -d=`
-      log(`Image version: ${process.env.IMAGE_VERSION}` );
-      //await $`cd ${cloneFrom} && bash dock.sh clone ${process.env.BUILD_ENVIRONMENT} ${process.env.BUILD_SITE} ${process.env.IMAGE_VERSION}`;
-      await (async () => {
-        try {
-            // Execute the shell command
-            const result = await $`cd ${cloneFrom} && bash dock.sh clone ${connectToEnv} ${process.env.BUILD_SITE} ${process.env.IMAGE_VERSION}`;
-            console.log('Command succeeded:');
-            console.log('stdout:', result.stdout); // Standard output
-            console.log('stderr:', result.stderr); // Standard error
-        } catch (error) {
-            console.error('Command failed:');
-            console.error('Exit Code:', error._code); // Exit code of the command
-            console.error('Signal:', error._signal); // Signal that caused termination (if any)
-            console.error('stdout:', error._stdout); // Standard output
-            console.error('stderr:', error._stderr); // Standard error
-        }
-    })();
-    
-    
-    } else {
-      log('Site already exists. Continuing Auth0 setup...');
-    }
-  
-    
+  const site = process.env.BUILD_SITE;
+  if (!site) {
+    log('Error: BUILD_SITE is not set');
+    process.exit(1);
+  }
+  const siteCommonVaultPath = `secret/data/${site}/common/config`;
+
+  // 2) getVaultSecrets
+  const secretsJson = await getVaultSecrets(siteCommonVaultPath);
+  if (!secretsJson.AUTH0_CLIENT_ID) {
+    log('Failed to retrieve secret data.');
+    process.exit(1);
+  }
+  const siteCommonSecrets = secretsJson;
+
+  // 3) Export secrets as environment variables
+  process.env.AUTH0_CLIENT_ID = siteCommonSecrets.AUTH0_CLIENT_ID;
+  process.env.AUTH0_CLIENT_SECRET = siteCommonSecrets.AUTH0_CLIENT_SECRET;
+
+  process.env.AUTH0_REGION_DOMAIN = 'us.auth0.com';
+
+  log(`BUILD_ENVIRONMENT: ${connectToEnv}`);
+  log(`BUILD_SITE: ${process.env.BUILD_SITE}`);
+  log(`AUTH0_SUBDOMAIN: ${process.env.AUTH0_SUBDOMAIN}`);
+  log(`AUTH0_REGION_DOMAIN: ${process.env.AUTH0_REGION_DOMAIN}`);
+  log(`AUTH0_CLIENT_ID: ${process.env.AUTH0_CLIENT_ID}`);
+
+  process.env.AUTH0_DOMAIN = `docupace-${process.env.BUILD_ENVIRONMENT}-${process.env.BUILD_SITE}.${process.env.AUTH0_REGION_DOMAIN}`;
+
+  const projectRoot = process.cwd();
+  // 4) Clone 'connect-deploy' into CONNECT_DIR
+
+  await gitCheckout('connect-deploy', process.env.CONNECT_DIR);
+
+  await gitCheckout(
+    `${connectToEnv}-site-settings`,
+    `${process.env.CONNECT_DIR}/${connectToEnv}-site-settings`,
+  );
+
+  // 5) Create site clone (emulating the dock.sh call)
+  const cloneFrom = path.join(
+    projectRoot,
+    process.env.CONNECT_DIR,
+    `envs`,
+    `${connectFromEnv}/${process.env.FROM_BUILD_SITE}`,
+  );
+  const cloneTo = path.join(
+    projectRoot,
+    process.env.CONNECT_DIR,
+    `envs`,
+    `${connectToEnv}/${process.env.BUILD_SITE}`,
+  );
+
+  if (!(await fs.pathExists(cloneFrom))) {
+    log('Clone template directory not found:');
+    process.exit(1);
+  }
+
+  if (!(await fs.pathExists(cloneTo))) {
+    log('New site does not exist. Performing cloning...');
+
+    process.env.IMAGE_VERSION =
+      await $`cd ${cloneFrom} && grep -E '^IMAGE_VERSION=' dock.sh | cut -f2 -d=`;
+    log(`Image version: ${process.env.IMAGE_VERSION}`);
+    //await $`cd ${cloneFrom} && bash dock.sh clone ${process.env.BUILD_ENVIRONMENT} ${process.env.BUILD_SITE} ${process.env.IMAGE_VERSION}`;
     await (async () => {
       try {
-          // Execute the shell command
-          const result = await $`cd ${cloneTo} && bash dock.sh getAuth0Metadata`;
-          console.log('Command succeeded:');
-          console.log('stdout:', result.stdout); // Standard output
-          console.log('stderr:', result.stderr); // Standard error
+        // Execute the shell command
+        const result =
+          await $`cd ${cloneFrom} && bash dock.sh clone ${connectToEnv} ${process.env.BUILD_SITE} ${process.env.IMAGE_VERSION}`;
+        console.log('Command succeeded:');
+        console.log('stdout:', result.stdout); // Standard output
+        console.log('stderr:', result.stderr); // Standard error
       } catch (error) {
-          console.error('Command failed:');
-          console.error('Exit Code:', error._code); // Exit code of the command
-          console.error('Signal:', error._signal); // Signal that caused termination (if any)
-          console.error('stdout:', error._stdout); // Standard output
-          console.error('stderr:', error._stderr); // Standard error
+        console.error('Command failed:');
+        console.error('Exit Code:', error._code); // Exit code of the command
+        console.error('Signal:', error._signal); // Signal that caused termination (if any)
+        console.error('stdout:', error._stdout); // Standard output
+        console.error('stderr:', error._stderr); // Standard error
       }
-  })();
-
+    })();
+  } else {
+    log('Site already exists. Continuing Auth0 setup...');
+  }
 
-    // 7) Check conf files, print logs
-    await $`grep "auth0" ${path.join(cloneTo, 'conf/application.conf')}`;
-    await $`ls -all ${path.join(cloneTo, 'conf')}`;
-    await $`ls -all ${path.join(cloneTo, 'conf/saml')}`;
-    await $`cat ${path.join(cloneTo, 'conf/saml/auth0.xml')}`;
-  
-    // 8) Git add, commit, push
-    await $`cd ${cloneTo} && git checkout master && git pull --ff-only`;
-    await $`cd ${cloneTo} && git remote -v`;
-    await $`cd ${cloneTo} && git branch`;
-    await $`cd ${cloneTo} && git status`;
-    await $`cd ${cloneTo} && git add . ../sites.sh`;
-    await $`cd ${cloneTo} && git status`;
-  
-    const numChanges = (
-      await $`cd ${cloneTo} && git diff-index HEAD`
-    ).stdout.split('\n').filter(Boolean).length;
-  
-    if (numChanges > 0) {
-      const jiraTicket = process.env.JIRA_TICKET || 'NO_JIRA';
-      const message = `${jiraTicket} usdoc-s-builui job download_auth0_metadata for ${connectToEnv}/${process.env.BUILD_SITE}`;
-      log('About to commit changes to git');
-      await $`cd ${cloneTo} && git commit -m ${message}`;
-      await $`cd ${cloneTo} && git push -u origin master`;
-    } else {
-      log('No changes have been made. The site likely already has the correct configuration.');
+  await (async () => {
+    try {
+      // Execute the shell command
+      const result = await $`cd ${cloneTo} && bash dock.sh getAuth0Metadata`;
+      console.log('Command succeeded:');
+      console.log('stdout:', result.stdout); // Standard output
+      console.log('stderr:', result.stderr); // Standard error
+    } catch (error) {
+      console.error('Command failed:');
+      console.error('Exit Code:', error._code); // Exit code of the command
+      console.error('Signal:', error._signal); // Signal that caused termination (if any)
+      console.error('stdout:', error._stdout); // Standard output
+      console.error('stderr:', error._stderr); // Standard error
     }
+  })();
+
+  // 7) Check conf files, print logs
+  await $`grep "auth0" ${path.join(cloneTo, 'conf/application.conf')}`;
+  await $`ls -all ${path.join(cloneTo, 'conf')}`;
+  await $`ls -all ${path.join(cloneTo, 'conf/saml')}`;
+  await $`cat ${path.join(cloneTo, 'conf/saml/auth0.xml')}`;
+
+  // 8) Git add, commit, push
+  await $`cd ${cloneTo} && git checkout master && git pull --ff-only`;
+  await $`cd ${cloneTo} && git remote -v`;
+  await $`cd ${cloneTo} && git branch`;
+  await $`cd ${cloneTo} && git status`;
+  await $`cd ${cloneTo} && git add . ../sites.sh`;
+  await $`cd ${cloneTo} && git status`;
+
+  const numChanges = (await $`cd ${cloneTo} && git diff-index HEAD`).stdout
+    .split('\n')
+    .filter(Boolean).length;
+
+  if (numChanges > 0) {
+    const jiraTicket = process.env.JIRA_TICKET || 'NO_JIRA';
+    const message = `${jiraTicket} usdoc-s-builui job download_auth0_metadata for ${connectToEnv}/${process.env.BUILD_SITE}`;
+    log('About to commit changes to git');
+    await $`cd ${cloneTo} && git commit -m ${message}`;
+    await $`cd ${cloneTo} && git push -u origin master`;
+  } else {
+    log(
+      'No changes have been made. The site likely already has the correct configuration.',
+    );
   }
-  
+}

package/src/next/deploy.js

@@ -6,7 +6,7 @@ import lodash from 'lodash';
 import { appInfo, environmentConfig, getRepUrl } from './config.js';
 import { copy2 } from './copy.js';
 import axios from 'axios';
-import { deployCore } from './jenkins.js';
+import { deployCore, deployConnect } from './jenkins.js';
 
 /**
  * Clone the repository, read the YAML file, and return the parsed data and file paths.
@@ -21,6 +21,62 @@ function getRepoLocalPath(env) {
   return { repoPath, repoName };
 }
 
+async function updateAndCommitConnectVersion(
+  toEnv,
+  toSite,
+  getComparedVersion,
+  connectDeployPath,
+) {
+  const filePath = path.join(
+    connectDeployPath,
+    'envs',
+    toEnv,
+    toSite,
+    'dock.sh',
+  );
+
+  try {
+    let content = fs.readFileSync(filePath, 'utf8');
+    content = content.replace(
+      /IMAGE_VERSION=.*/,
+      `IMAGE_VERSION=${getComparedVersion}`,
+    );
+    fs.writeFileSync(filePath, content, 'utf8');
+
+    // Git commands to stage, commit and push changes
+    await $`cd ${connectDeployPath}`;
+    await $`git add ${filePath}`;
+    await $`git commit -m "Update Connect version for ${toSite} in ${toEnv} to ${getComparedVersion}"`;
+    await $`git push`;
+  } catch (error) {
+    console.error('Error updating Connect version:', error);
+    throw error;
+  }
+}
+
+async function compareGetConnectSiteVersions(fromEnv, fromSite, toEnv, toSite) {
+  try {
+    const fromResponse = await axios.get(
+      `https://${fromSite}.${fromEnv}.dpai.tech/connect/loginFooter`,
+    );
+    const toResponse = await axios.get(
+      `https://${toSite}.${toEnv}.dpai.tech/connect/loginFooter`,
+    );
+
+    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];
+      }
+    }
+    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);
@@ -347,6 +403,8 @@ export async function deployFromSite(
   toEnv,
   toSite,
   isDeployCore,
+  isDeployConnect,
+  runLiquibase,
 ) {
   if (isDeployCore === 'true') {
     const branchName = await getCoreBranchName(fromEnv, fromSite);
@@ -363,6 +421,28 @@ export async function deployFromSite(
     });*/
   }
 
+  if (isDeployConnect === 'true') {
+    const branch = '';
+    const getComparedVersion = await compareGetConnectSiteVersions(
+      fromEnv,
+      fromSite,
+      toEnv,
+      toSite,
+    );
+    if (getComparedVersion) {
+      const connectDeployPath = await cloneRepository('connect-deploy');
+      // update target version set to git-commit-${getCommparedVersion}}
+      await updateAndCommitConnectVersion(
+        toEnv,
+        toSite,
+        getComparedVersion,
+        connectDeployPath,
+      );
+      // save and deploy
+      await deployConnect(toEnv, toSite, runLiquibase, branch);
+    }
+  }
+
   // Clone repositories for source and target environments
   const fromRepoPath = await cloneEnvRepository(fromEnv);
   const toRepoPath =

package/src/next/pipline.js

@@ -99,7 +99,6 @@ export async function runPipeline(
       return;
     }
 
-
     let status = '';
     do {
       console.log('Checking pipeline status...');

package/src/next/publish.js

@@ -1,48 +1,48 @@
-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}`;
-    }
-  } else {
-    console.log('No Git tags found pointing to the current HEAD.');
-  }
-
-  // Docker logout
-  await $`docker logout ${process.env.JF_REGISTRY_URL}`;
-}
+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}`;
+    }
+  } else {
+    console.log('No Git tags found pointing to the current HEAD.');
+  }
+
+  // Docker logout
+  await $`docker logout ${process.env.JF_REGISTRY_URL}`;
+}

package/src/next/pull.js

@@ -1,7 +1,7 @@
-import { $ } from 'zx';
-
-export async function pull(imageName) {
-  const JF_REGISTRY_FULL_URL = `${process.env.JF_REGISTRY_URL}/${process.env.JF_REGISTRY_REPO_NAME}`;
-  console.log(`Pulling Docker image: ${JF_REGISTRY_FULL_URL}/${imageName}`);
-  await $`docker pull ${JF_REGISTRY_FULL_URL}/${imageName}`;
-}
+import { $ } from 'zx';
+
+export async function pull(imageName) {
+  const JF_REGISTRY_FULL_URL = `${process.env.JF_REGISTRY_URL}/${process.env.JF_REGISTRY_REPO_NAME}`;
+  console.log(`Pulling Docker image: ${JF_REGISTRY_FULL_URL}/${imageName}`);
+  await $`docker pull ${JF_REGISTRY_FULL_URL}/${imageName}`;
+}

package/src/next/sonar.js

@@ -1,23 +1,23 @@
-import { $ } from 'zx';
-
-export async function sonar(GIT_SHA) {
-  const IMAGE_NAME = `${process.env.BITBUCKET_REPO_SLUG}:sha-${GIT_SHA}`;
-  const SONAR_CONTAINER_NAME = `${process.env.BITBUCKET_REPO_SLUG}-${GIT_SHA}`;
-
-  console.log(`Running Sonar analysis on Docker image: ${IMAGE_NAME}`);
-
-  // Remove existing container
-  const existingContainer = (
-    await $`docker ps -a --filter "name=${SONAR_CONTAINER_NAME}" --format "{{.Names}}"`
-  ).stdout.trim();
-  if (existingContainer) {
-    await $`docker rm -f ${SONAR_CONTAINER_NAME}`;
-  }
-
-  await $`docker run --rm \
-    -e BRANCH=${process.env.BITBUCKET_BRANCH} \
-    -e PR_ID=${process.env.BITBUCKET_PR_ID} \
-    -e PR_DESTINATION_BRANCH=${process.env.BITBUCKET_PR_DESTINATION_BRANCH} \
-    -e SONAR_TOKEN=${process.env.SONAR_TOKEN} \
-    --name ${SONAR_CONTAINER_NAME} ${IMAGE_NAME} pnpm sonar`;
-}
+import { $ } from 'zx';
+
+export async function sonar(GIT_SHA) {
+  const IMAGE_NAME = `${process.env.BITBUCKET_REPO_SLUG}:sha-${GIT_SHA}`;
+  const SONAR_CONTAINER_NAME = `${process.env.BITBUCKET_REPO_SLUG}-${GIT_SHA}`;
+
+  console.log(`Running Sonar analysis on Docker image: ${IMAGE_NAME}`);
+
+  // Remove existing container
+  const existingContainer = (
+    await $`docker ps -a --filter "name=${SONAR_CONTAINER_NAME}" --format "{{.Names}}"`
+  ).stdout.trim();
+  if (existingContainer) {
+    await $`docker rm -f ${SONAR_CONTAINER_NAME}`;
+  }
+
+  await $`docker run --rm \
+    -e BRANCH=${process.env.BITBUCKET_BRANCH} \
+    -e PR_ID=${process.env.BITBUCKET_PR_ID} \
+    -e PR_DESTINATION_BRANCH=${process.env.BITBUCKET_PR_DESTINATION_BRANCH} \
+    -e SONAR_TOKEN=${process.env.SONAR_TOKEN} \
+    --name ${SONAR_CONTAINER_NAME} ${IMAGE_NAME} pnpm sonar`;
+}