@docupace/pipeline 1.0.39-matttest.2 → 1.0.39-matttest.20

package/next/execute.sh

@@ -53,8 +53,14 @@ copy() {
 }
 
 publish() {
-    BUILD_IMAGE_NAME="${BITBUCKET_REPO_SLUG}:build-${BITBUCKET_BUILD_NUMBER}"
-    IMAGE_NAME="${BITBUCKET_REPO_SLUG}:sha-${GIT_SHA}"
+    SLUG_SUFFIX=""
+    if [ -n "$APP_NAME" ]; then
+      SLUG_SUFFIX="-${APP_NAME}"
+    fi
+
+    BUILD_IMAGE_NAME="${BITBUCKET_REPO_SLUG}${SLUG_SUFFIX}:build-${BITBUCKET_BUILD_NUMBER}"
+    IMAGE_NAME="${BITBUCKET_REPO_SLUG}${SLUG_SUFFIX}:sha-${GIT_SHA}"
+
     export DOCKER_HOST=""
 
     echo "Publishing Docker image ${IMAGE_NAME}..."

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@docupace/pipeline",
-  "version": "1.0.39-matttest.2",
+  "version": "1.0.39-matttest.20",
   "description": "",
   "main": "index.js",
   "type": "module",

package/src/next/publish.js

@@ -1,48 +1,61 @@
 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}`;
+const {
+  JF_REGISTRY_URL,
+  JF_REGISTRY_REPO_NAME,
+  JF_REGISTRY_PASSWORD_DEV,
+  JF_REGISTRY_USER_DEV,
+  BITBUCKET_REPO_SLUG,
+  BITBUCKET_BUILD_NUMBER,
+  APP_NAME,
+} = process.env;
+
+const JF_REGISTRY_FULL_URL = `${JF_REGISTRY_URL}/${JF_REGISTRY_REPO_NAME}`;
+
+async function loginRegistry() {
+  await $`echo ${JF_REGISTRY_PASSWORD_DEV} | docker login --username ${JF_REGISTRY_USER_DEV} --password-stdin ${JF_REGISTRY_URL}`;
+}
+
+async function logoutRegistry() {
+  await $`docker logout ${JF_REGISTRY_URL}`;
+}
+
+export async function publish(gitSha) {
+  process.env.DOCKER_HOST = '';
+  const SLUG_SUFFIX = APP_NAME ? `-${APP_NAME}` : '';
+  const BUILD_IMAGE_NAME = `${BITBUCKET_REPO_SLUG}${SLUG_SUFFIX}:build-${BITBUCKET_BUILD_NUMBER}`;
+  const IMAGE_NAME = `${BITBUCKET_REPO_SLUG}${SLUG_SUFFIX}:sha-${gitSha}`;
 
-  console.log(`Publishing Docker image: ${IMAGE_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}`;
+  await loginRegistry();
 
-  // Check if the image already exists
-  try {
-    await $`docker manifest inspect ${JF_REGISTRY_FULL_URL}/${IMAGE_NAME}`;
+  const manifestCheck =
+    await $`docker manifest inspect ${JF_REGISTRY_FULL_URL}/${IMAGE_NAME}`
+      .quiet()
+      .catch(() => null);
+
+  if (manifestCheck?.exitCode === 0) {
     console.log(
-      `Tag sha-${GIT_SHA} already exists in the remote repository. Skipping push.`,
+      `Tag sha-${gitSha} already exists in the remote repository. Skipping push.`,
     );
-  } catch {
+  } else {
     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.');
+  const GIT_TAGS = (await $`git tag --points-at HEAD`).stdout
+    .trim()
+    .split('\n')
+    .filter(Boolean);
+  for (const GIT_TAG of GIT_TAGS) {
+    const tagName = `${BITBUCKET_REPO_SLUG}:${GIT_TAG}`;
+    await $`docker tag ${IMAGE_NAME} ${JF_REGISTRY_FULL_URL}/${tagName}`;
+    await $`docker push ${JF_REGISTRY_FULL_URL}/${tagName}`;
   }
 
-  // Docker logout
-  await $`docker logout ${process.env.JF_REGISTRY_URL}`;
+  await logoutRegistry();
 }

package/src/next/util.js

@@ -1,6 +1,9 @@
 import { existsSync } from 'fs';
 import { join } from 'path';
 import { $, nothrow } from 'zx';
+import path from 'path';
+
+const GIT_SHA = (await $`git log --pretty=format:'%h' -n 1`).stdout.trim();
 
 export function isMonoRepo() {
   // Check for the presence of turbo.json which indicates a Turborepo monorepo
@@ -15,34 +18,21 @@ export function isMonoRepo() {
  */
 export async function getChangedPackagesInternal(fromRef, toRef) {
   try {
+    console.log(process.cwd());
     // Run the turbo command to get changed packages between branches
     const filterArg = `[${fromRef}...${toRef}]`;
     const turboDryOutput =
       await $`turbo run build --filter=${filterArg} --dry=json`;
-    const packageNames =
-      await $`echo ${turboDryOutput} | jq -r '.tasks[].taskId' | cut -d'#' -f1 | sort -u`;
 
-    // If we didn't get any package names, return empty array
-    if (!packageNames.stdout.trim()) {
-      return [];
-    }
+    const dryRunJson = turboDryOutput.stdout.trim();
 
-    // For each package name, get its path
-    const packages = [];
-    const packageNamesList = packageNames.stdout.trim().split('\n');
+    const dryRun = JSON.parse(dryRunJson);
 
-    for (const packageName of packageNamesList) {
-      if (packageName) {
-        const packagePath =
-          await $`pnpm m ls -r --json | jq -r --arg name ${packageName} '.[] | select(.name == $name) | .path'`;
-        if (packagePath.stdout.trim()) {
-          packages.push({
-            name: packageName,
-            path: packagePath.stdout.trim(),
-          });
-        }
-      }
-    }
+    const packages = dryRun.tasks.map((task) => ({
+      name: task.package,
+      directory: task.directory,
+      path: path.resolve(process.cwd(), task.directory),
+    }));
 
     return packages;
   } catch (error) {
@@ -55,30 +45,37 @@ export async function getChangedPackages() {
   const branch = process.env.BITBUCKET_BRANCH;
   const destBranch = process.env.BITBUCKET_PR_DESTINATION_BRANCH;
 
+  await $`git fetch origin ${destBranch}:${destBranch}`;
+  console.log(`Getting changed packages for [${destBranch}...${branch}]`);
   const changedPackages = await getChangedPackagesInternal(destBranch, branch);
+  console.log('Changed Packages:\n', JSON.stringify(changedPackages, null, 2));
   return changedPackages;
 }
 
 export async function getChangedAppPackages() {
   const changedPackages = await getChangedPackages();
   const appPackages = changedPackages.filter((appPackage) =>
-    appPackage.name.endsWith('-app'),
+    appPackage.directory.startsWith('apps'),
   );
   return appPackages;
 }
 
 export async function buildChangePackages() {
   const appPackages = await getChangedAppPackages();
+  if (appPackages.length == 0) {
+    throw new Error('Nothing to build');
+  }
   for (const appPackage of appPackages) {
-    await dockerBuild(appPackage.path);
+    await dockerBuild(appPackage);
   }
 }
 
-export async function dockerBuild(path) {
+export async function dockerBuild(appPackage) {
   process.env.DOCKER_HOST = '';
-  const imageName = `${process.env.BITBUCKET_REPO_SLUG}:sha-${process.env.GIT_SHA}-withMaps`;
+  const shortName = appPackage.name.replace('@docupace/', '');
+  const imageName = `${process.env.BITBUCKET_REPO_SLUG}-${shortName}:sha-${GIT_SHA}-withMaps`;
   console.log(`Building Docker image ${imageName}...`);
-  await $`docker build --secret id=npm_token,env=DOCUPACE_NPM_TOKEN ${path} --file Dockerfile --target builder --tag ${imageName}`;
+  await $`docker build --secret id=npm_token,env=DOCUPACE_NPM_TOKEN . --file ${path.resolve(appPackage.path, 'Dockerfile')} --target builder --tag ${imageName}`;
 }
 
 export async function setGitInfo() {