@docupace/pipeline 1.0.40 → 1.0.43

package/src/next/copy.js

@@ -1,55 +1,55 @@
-import { $ } from 'zx';
-import { appInfo, getEnvInfo, jfRegistryUrl } from './config.js';
-
-/*
-    TARGET_ENV
-    PUBLISH_TAG
-    REPOSITORY_NAME
- */
-export async function copy(application, fromEnv, toEnv, tag) {
-  const envInfo = getEnvInfo();
-  const repositoryName = appInfo[application].repositoryName;
-  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}`;
-}
-
-export async function copy2(repositoryName, fromEnv, toEnv, tag) {
-  console.log(
-    `Copying repository ${repositoryName} from ${fromEnv} to ${toEnv} for tag ${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}`;
-}
+import { $ } from 'zx';
+import { appInfo, getEnvInfo, jfRegistryUrl } from './config.js';
+
+/*
+    TARGET_ENV
+    PUBLISH_TAG
+    REPOSITORY_NAME
+ */
+export async function copy(application, fromEnv, toEnv, tag) {
+  const envInfo = getEnvInfo();
+  const repositoryName = appInfo[application].repositoryName;
+  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}`;
+}
+
+export async function copy2(repositoryName, fromEnv, toEnv, tag) {
+  console.log(
+    `Copying repository ${repositoryName} from ${fromEnv} to ${toEnv} for tag ${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/haproxy.js

@@ -2,7 +2,8 @@ import { $ } from 'zx';
 import fs from 'fs-extra';
 import path from 'path';
 
-export async function haproxySync(cluster) {
+export async function haproxySync() {
+  const cluster = process.env.HAPROXY_CLUSTER;
   if (cluster !== 'preprod' && cluster !== 'stage') {
     console.log('Error: Cluster must be preprod or stage');
     process.exit(1);
@@ -13,8 +14,14 @@ export async function haproxySync(cluster) {
 
   // Create haproxy.sh
   const cluserHostMap = {
-    preprod: '10.10.28.198',
-    stage: '10.12.28.10',
+    preprod: {
+      host: '10.10.28.198',
+      branch: 'master',
+    },
+    stage: {
+      host: '10.12.28.10',
+      branch: 'INFP-6565-haproxy-prod-implementation',
+    },
   };
 
   const scriptContent = `
@@ -24,13 +31,14 @@ export async function haproxySync(cluster) {
   cd ${repoPath}
   pwd
   git stash
+  git fetch --all
   git pull origin master
-  git checkout master
+  git checkout ${cluserHostMap[cluster].branch}
   git submodule update --remote
   git submodule foreach --recursive git checkout master
   git submodule foreach --recursive git pull origin master
   
-  ansible-playbook -i inventories/${cluster}/inventory haproxy.yml -e "cluster=${cluster}"
+  ansible-playbook -i inventories/${cluster}/inventory haproxy.yml -e "cluster=${cluster}  -e build=true"
   
   echo "proceeding"
   echo "committing changes"
@@ -52,8 +60,8 @@ export async function haproxySync(cluster) {
   await fs.chmod('private.key', 0o600);
 
   // Copy script to remote
-  await $`scp -i private.key -o StrictHostKeyChecking=no haproxy.sh root@${cluserHostMap[cluster]}:/tmp/haproxy.sh`;
+  await $`scp -i private.key -o StrictHostKeyChecking=no haproxy.sh root@${cluserHostMap[cluster].host}:/tmp/haproxy.sh`;
 
   // Execute script on remote
-  await $`ssh -i private.key -o StrictHostKeyChecking=no root@${cluserHostMap[cluster]} "bash /tmp/haproxy.sh"`;
+  await $`ssh -i private.key -o StrictHostKeyChecking=no root@${cluserHostMap[cluster].host} "bash /tmp/haproxy.sh"`;
 }

package/src/next/jira.js

@@ -1,83 +1,83 @@
-import axios from 'axios';
-
-// Create preconfigured axios instance for Jira
-const jiraClient = axios.create({
-  baseURL: 'https://docupacellc.atlassian.net',
-  auth: {
-    username: process.env.JIRA_API_EMAIL,
-    password: process.env.JIRA_API_KEY,
-  },
-  headers: {
-    'Content-Type': 'application/json',
-  },
-});
-
-const packageComponents = {
-  'docupace-ui': 'next-ui',
-  'docupace-graphql-server': 'graphql-server',
-  '@docupace/template': 'template',
-};
-/**
- * Updates the component version custom field in Jira
- * @param {string} issueKey - The Jira issue key
- * @param {string} component - The component name
- * @param {string} version - The version to set
- */
-export async function updateComponentVersion(issueKey, packageName, version) {
-  const component = packageComponents[packageName] ?? packageName;
-  console.log(
-    `Updating ${issueKey} for package ${packageName} translated to component ${component} with version ${version}`,
-  );
-  try {
-    // First get current field value
-    const response = await jiraClient.get(
-      `/rest/api/2/issue/${issueKey}?fields=customfield_10458`,
-    );
-
-    let currentValue = response.data.fields.customfield_10458 || '';
-    let components = new Map();
-
-    // Parse existing components
-    if (currentValue) {
-      currentValue.split(';').forEach((entry) => {
-        const [comp, ver] = entry.split(':');
-        components.set(comp, ver);
-      });
-    }
-
-    // Update or add new component version
-    components.set(component, version);
-
-    // Convert back to string format
-    const newValue = Array.from(components.entries())
-      .map(([comp, ver]) => `${comp}:${ver}`)
-      .join(';');
-
-    // Update the field
-    await jiraClient.put(`/rest/api/2/issue/${issueKey}`, {
-      fields: {
-        customfield_10458: newValue,
-      },
-    });
-
-    console.log(`Updated component versions for ${issueKey}: ${newValue}`);
-  } catch (error) {
-    console.error(`Error updating Jira component version: ${error.message}`);
-  }
-}
-
-/**
- * Makes a request to the Jira API using preconfigured client
- * @param {string} endpoint - The API endpoint (starting with /)
- * @param {Object} options - Request options (method, body, etc)
- * @returns {Promise<any>} The response data
- */
-export async function makeJiraRequest(endpoint, options = {}) {
-  try {
-    const response = await jiraClient.get(endpoint, options);
-    return response.data;
-  } catch (error) {
-    console.error(`Error making Jira request: ${error.message}`);
-    throw error;
-  }
-}
+import axios from 'axios';
+
+// Create preconfigured axios instance for Jira
+const jiraClient = axios.create({
+  baseURL: 'https://docupacellc.atlassian.net',
+  auth: {
+    username: process.env.JIRA_API_EMAIL,
+    password: process.env.JIRA_API_KEY,
+  },
+  headers: {
+    'Content-Type': 'application/json',
+  },
+});
+
+const packageComponents = {
+  'docupace-ui': 'next-ui',
+  'docupace-graphql-server': 'graphql-server',
+  '@docupace/template': 'template',
+};
+/**
+ * Updates the component version custom field in Jira
+ * @param {string} issueKey - The Jira issue key
+ * @param {string} component - The component name
+ * @param {string} version - The version to set
+ */
+export async function updateComponentVersion(issueKey, packageName, version) {
+  const component = packageComponents[packageName] ?? packageName;
+  console.log(
+    `Updating ${issueKey} for package ${packageName} translated to component ${component} with version ${version}`,
+  );
+  try {
+    // First get current field value
+    const response = await jiraClient.get(
+      `/rest/api/2/issue/${issueKey}?fields=customfield_10458`,
+    );
+
+    let currentValue = response.data.fields.customfield_10458 || '';
+    let components = new Map();
+
+    // Parse existing components
+    if (currentValue) {
+      currentValue.split(';').forEach((entry) => {
+        const [comp, ver] = entry.split(':');
+        components.set(comp, ver);
+      });
+    }
+
+    // Update or add new component version
+    components.set(component, version);
+
+    // Convert back to string format
+    const newValue = Array.from(components.entries())
+      .map(([comp, ver]) => `${comp}:${ver}`)
+      .join(';');
+
+    // Update the field
+    await jiraClient.put(`/rest/api/2/issue/${issueKey}`, {
+      fields: {
+        customfield_10458: newValue,
+      },
+    });
+
+    console.log(`Updated component versions for ${issueKey}: ${newValue}`);
+  } catch (error) {
+    console.error(`Error updating Jira component version: ${error.message}`);
+  }
+}
+
+/**
+ * Makes a request to the Jira API using preconfigured client
+ * @param {string} endpoint - The API endpoint (starting with /)
+ * @param {Object} options - Request options (method, body, etc)
+ * @returns {Promise<any>} The response data
+ */
+export async function makeJiraRequest(endpoint, options = {}) {
+  try {
+    const response = await jiraClient.get(endpoint, options);
+    return response.data;
+  } catch (error) {
+    console.error(`Error making Jira request: ${error.message}`);
+    throw error;
+  }
+}

package/src/next/pipline.js

@@ -1,114 +1,114 @@
-import axios from 'axios';
-import { getBitbucketInfo } from './config.js';
-
-const BITBUCKET_BASE_URL = 'https://api.bitbucket.org/2.0';
-
-const BITBUCKET_WS_URL = 'https://bitbucket.org/dp-cloud';
-
-async function triggerPipelineByName(
-  repository,
-  pipelineName,
-  branch,
-  variables,
-) {
-  const { username, password, workspace } = getBitbucketInfo();
-  const url = `${BITBUCKET_BASE_URL}/repositories/${workspace}/${repository}/pipelines/`;
-  const auth = {
-    username: username,
-    password: password,
-  };
-
-  const payload = {
-    target: {
-      type: 'pipeline_ref_target',
-      ref_type: 'branch',
-      ref_name: branch,
-      selector: {
-        type: 'custom',
-        pattern: pipelineName,
-      },
-    },
-    variables: variables
-      ? Object.entries(variables).map(([key, value]) => ({
-          key,
-          value,
-          secured: false, // Set to true if the variable should be secure
-        }))
-      : undefined,
-  };
-
-  try {
-    const response = await axios.post(url, payload, { auth });
-    return response.data;
-  } catch (error) {
-    console.error(
-      'Error triggering custom pipeline:',
-      error.response?.data || error.message,
-    );
-    throw error;
-  }
-}
-
-async function getPipelineStatus(repository, pipelineUUID) {
-  const { username, password, workspace } = getBitbucketInfo();
-  const url = `${BITBUCKET_BASE_URL}/repositories/${workspace}/${repository}/pipelines/${pipelineUUID}`;
-  const auth = {
-    username: username,
-    password: password,
-  };
-
-  try {
-    const response = await axios.get(url, { auth });
-    return response.data.state.name;
-  } catch (error) {
-    console.error(
-      'Error fetching pipeline status:',
-      error.response?.data || error.message,
-    );
-    throw error;
-  }
-}
-
-export async function runPipeline(
-  repository,
-  pipelineName,
-  branch,
-  variables,
-  wait = false,
-) {
-  try {
-    console.log(
-      `Triggering custom pipeline: ${pipelineName} for branch: ${branch}...`,
-    );
-    const pipeline = await triggerPipelineByName(
-      repository,
-      pipelineName,
-      branch,
-      variables,
-    );
-
-    const pipelineUUID = pipeline.uuid;
-    const buildNumber = pipeline.build_number;
-
-    console.log(`Pipeline triggered with UUID: ${pipelineUUID}`);
-    console.log(
-      `See results here: ${BITBUCKET_WS_URL}/${repository}/piplines/results/${buildNumber}`,
-    );
-
-    if (!wait) {
-      return;
-    }
-
-    let status = '';
-    do {
-      console.log('Checking pipeline status...');
-      await new Promise((resolve) => setTimeout(resolve, 10000)); // Wait 10 seconds
-      status = await getPipelineStatus(repository, pipelineUUID);
-      console.log(`Pipeline status: ${status}`);
-    } while (['IN_PROGRESS', 'PENDING', 'RUNNING'].includes(status));
-
-    console.log(`Pipeline completed with status: ${status}`);
-  } catch (error) {
-    console.error('Error monitoring pipeline:', error.message);
-  }
-}
+import axios from 'axios';
+import { getBitbucketInfo } from './config.js';
+
+const BITBUCKET_BASE_URL = 'https://api.bitbucket.org/2.0';
+
+const BITBUCKET_WS_URL = 'https://bitbucket.org/dp-cloud';
+
+async function triggerPipelineByName(
+  repository,
+  pipelineName,
+  branch,
+  variables,
+) {
+  const { username, password, workspace } = getBitbucketInfo();
+  const url = `${BITBUCKET_BASE_URL}/repositories/${workspace}/${repository}/pipelines/`;
+  const auth = {
+    username: username,
+    password: password,
+  };
+
+  const payload = {
+    target: {
+      type: 'pipeline_ref_target',
+      ref_type: 'branch',
+      ref_name: branch,
+      selector: {
+        type: 'custom',
+        pattern: pipelineName,
+      },
+    },
+    variables: variables
+      ? Object.entries(variables).map(([key, value]) => ({
+          key,
+          value,
+          secured: false, // Set to true if the variable should be secure
+        }))
+      : undefined,
+  };
+
+  try {
+    const response = await axios.post(url, payload, { auth });
+    return response.data;
+  } catch (error) {
+    console.error(
+      'Error triggering custom pipeline:',
+      error.response?.data || error.message,
+    );
+    throw error;
+  }
+}
+
+async function getPipelineStatus(repository, pipelineUUID) {
+  const { username, password, workspace } = getBitbucketInfo();
+  const url = `${BITBUCKET_BASE_URL}/repositories/${workspace}/${repository}/pipelines/${pipelineUUID}`;
+  const auth = {
+    username: username,
+    password: password,
+  };
+
+  try {
+    const response = await axios.get(url, { auth });
+    return response.data.state.name;
+  } catch (error) {
+    console.error(
+      'Error fetching pipeline status:',
+      error.response?.data || error.message,
+    );
+    throw error;
+  }
+}
+
+export async function runPipeline(
+  repository,
+  pipelineName,
+  branch,
+  variables,
+  wait = false,
+) {
+  try {
+    console.log(
+      `Triggering custom pipeline: ${pipelineName} for branch: ${branch}...`,
+    );
+    const pipeline = await triggerPipelineByName(
+      repository,
+      pipelineName,
+      branch,
+      variables,
+    );
+
+    const pipelineUUID = pipeline.uuid;
+    const buildNumber = pipeline.build_number;
+
+    console.log(`Pipeline triggered with UUID: ${pipelineUUID}`);
+    console.log(
+      `See results here: ${BITBUCKET_WS_URL}/${repository}/piplines/results/${buildNumber}`,
+    );
+
+    if (!wait) {
+      return;
+    }
+
+    let status = '';
+    do {
+      console.log('Checking pipeline status...');
+      await new Promise((resolve) => setTimeout(resolve, 10000)); // Wait 10 seconds
+      status = await getPipelineStatus(repository, pipelineUUID);
+      console.log(`Pipeline status: ${status}`);
+    } while (['IN_PROGRESS', 'PENDING', 'RUNNING'].includes(status));
+
+    console.log(`Pipeline completed with status: ${status}`);
+  } catch (error) {
+    console.error('Error monitoring pipeline:', error.message);
+  }
+}

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}`;
+}