build script improvements

vklimontovich · vklimontovich · commit 1372e49d5315 · 2024-01-10T12:14:21.000-05:00
diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml
@@ -4,8 +4,6 @@ on:
     branches:
       # todo - change with main
       - feat/newjitsu/self-hosted-revamped
-    tags:
-      - jitsu2-*
 
 jobs:
   build:
@@ -33,7 +31,6 @@ jobs:
         run: |
           echo "STORE_PATH=$(pnpm store path)" >> $GITHUB_OUTPUT
 
-
       - uses: actions/cache@v3
         name: Setup pnpm cache
         with:
@@ -45,15 +42,5 @@ jobs:
       - name: Install dependencies with pnpm
         run: pnpm install --no-frozen-lockfile
 
-      - name: Extract version from tag
-        if: startsWith(github.ref, 'refs/tags/jitsu2-')
-        id: version
-        run: echo "::set-output name=version::${GITHUB_REF#refs/tags/jitsu2-}"
-
-      - name: Build Beta Images
-        if: github.ref == 'refs/heads/feat/newjitsu/self-hosted-revamped'
-        run: pnpm build-scripts docker --tag beta --push-git-tag --push-docker
-
-      - name: Build Release Images
-        if: startsWith(github.ref, 'refs/tags/jitsu2-')
-        run: pnpm build-scripts docker --tag latest --version ${{ steps.version.outputs.version }} --push-git-tag --push-docker --dry-run
+      - name: Build Beta Images for AMD64
+        run: pnpm build-scripts docker --platform linux/amd64 --tag beta --push-git-tag --push-docker --logs
diff --git a/cli/build-scripts/package.json b/cli/build-scripts/package.json
@@ -13,11 +13,13 @@
     "exec": "ts-node src/index.ts"
   },
   "dependencies": {
-    "figlet": "^1.6.0",
+    "boxen": "^7.1.1",
+    "colorette": "^2.0.20",
     "isolated-vm": "^4.6.0",
     "jest-cli": "^29.7.0",
     "semver": "^7.5.4",
     "simple-git": "^3.22.0",
+    "string-width": "^7.0.0",
     "tslib": "^2.6.2"
   },
   "devDependencies": {
diff --git a/cli/build-scripts/src/box.ts b/cli/build-scripts/src/box.ts
@@ -0,0 +1,60 @@
+import { color } from "./colors";
+const chars = {
+  topLeft: "┌",
+  topRight: "┐",
+  bottomRight: "┘",
+  bottomLeft: "└",
+  vertical: "│",
+  horizontal: "─",
+};
+
+function stringWidth(str: string): number {
+  let width = 0;
+
+  for (const char of Array.from(str)) {
+    const codePoint = char.codePointAt(0);
+
+    // Ignore control characters and other non-printable characters
+    if (codePoint && (codePoint <= 31 || codePoint === 127)) {
+      continue;
+    }
+
+    // Basic check for surrogate pairs (common in emojis)
+    if (codePoint && codePoint > 0xffff) {
+      width += 2; // Assuming emoji width as 2
+    } else {
+      width += 1;
+    }
+  }
+
+  return width;
+}
+export function drawBox({ content }: { content: string | string[] }): string {
+  const contentLines = typeof content === "string" ? content.split("\n") : content;
+  const maxWidth = Math.max(...contentLines.map(stringWidth));
+
+  const resLines: string[] = [];
+  const px = 2;
+  const mx = 0;
+  resLines.push(
+    " ".repeat(mx) + color.gray(chars.topLeft + chars.horizontal.repeat(maxWidth + px * 2) + chars.topRight)
+  );
+
+  resLines.push(
+    ...contentLines.map(
+      line =>
+        " ".repeat(mx) +
+        color.gray(chars.vertical) +
+        " ".repeat(px) +
+        line.padEnd(maxWidth, " ") +
+        " ".repeat(px) +
+        color.gray(chars.vertical)
+    )
+  );
+
+  resLines.push(
+    " ".repeat(mx) + color.gray(chars.bottomLeft + chars.horizontal.repeat(maxWidth + px * 2) + chars.bottomRight)
+  );
+
+  return resLines.join("\n");
+}
diff --git a/cli/build-scripts/src/colors.ts b/cli/build-scripts/src/colors.ts
@@ -0,0 +1,3 @@
+import { createColors } from "colorette";
+
+export const color = createColors();
diff --git a/cli/build-scripts/src/docker.ts b/cli/build-scripts/src/docker.ts
@@ -4,6 +4,8 @@ import simpleGit from "simple-git";
 import * as fs from "fs";
 import { compare as semverCompare, parse as semverParse, SemVer } from "semver";
 import * as child_process from "child_process";
+import { color } from "./colors";
+import { drawBox } from "./box";
 
 type ReleaseStream = "beta" | "latest";
 
@@ -88,43 +90,84 @@ export async function docker(args: minimist.ParsedArgs): Promise<void> {
   let version = args.version;
   const tag: ReleaseStream = args.tag || "beta";
   const tagPrefix = args.taxPrefix || "jitsu2";
-  const dockerPlatforms = args.dockerPlatforms;
   const dryRun = !!(args["dry-run"] || false);
+  console.log(
+    drawBox({
+      content: [`Hi, I'm Jitsu Docker Builder!`, ``, `I'm going to build docker images for \`${tag}\` release stream`],
+    })
+  );
   if (!version) {
     version = await getAutomaticVersion(tag, tagPrefix);
-    console.info("--version is not specified, using automatic version: " + version);
+    console.info(
+      "💁🏻‍ Version (--version param) is not specified, using automatic version: " + color.bold(color.cyan(version))
+    );
   }
   const gitTag = `${tagPrefix}-${version}`;
   if ((await git.tags()).all.includes(gitTag)) {
     throw new Error(`Tag ${gitTag} for next version ${version} already exists. Aborting`);
   }
+  const logsDir = args["logs"] ? path.resolve(__dirname, "../../../", args["logs"]) : undefined;
+  if (logsDir) {
+    fs.mkdirSync(logsDir, { recursive: true });
+  }
 
   for (const dockerTarget of ["console", "rotor"]) {
-    console.log(`Building jitsucom/${dockerTarget}:${version}...`);
+    console.log(
+      `🚀 Building ${color.cyan(dockerTarget)} docker with tags: ${color.cyan(
+        `jitsucom/${dockerTarget}:${version}`
+      )} and ${color.cyan(`jitsucom/${dockerTarget}:${tag}`)}...`
+    );
     const dockerImageName = `jitsucom/${dockerTarget}`;
     const dockerArgs = [
       "buildx build",
       `--target ${dockerTarget}`,
-      "--progress plain",
-      args["docker-platforms"] && `--platform ${dockerPlatforms}`,
+      "--progress=plain",
+      args["platform"] && `--platform ${args["platform"]}`,
       `-t ${dockerImageName}:${tag}`,
       `-t ${dockerImageName}:${version}`,
       `-f all.Dockerfile`,
       args["push-docker"] ? "--push" : "--load",
       ".",
     ].filter(Boolean);
+    const qt = `${color.gray(color.bold("`"))}`;
+    console.log(
+      `🎻 Docker command\n\n\t${qt}${color.cyan(
+        `docker ${dockerArgs.filter(args => !args.startsWith("--progress")).join(" ")}`
+      )}${qt}\n\n\t`
+    );
     if (dryRun) {
-      console.log("Dry run: docker " + dockerArgs.join(" "));
+      console.log(`🏃🏻 Skipping actual build because of ${color.cyan("--dry-run")} flag`);
     } else {
+      const logPath = logsDir
+        ? path.join(logsDir, `${dockerTarget}-docker-build-${new Date().toISOString()}.log`)
+        : undefined;
+      const stream = logsDir ? fs.createWriteStream(logPath!) : undefined;
+      if (stream) {
+        console.log(`📝 Writing logs to ${color.cyan(logPath!)}`);
+        stream.write(`Building ${dockerImageName}:${tag}\n`);
+        stream.write(`Command:\n\tdocker ${dockerArgs.join(" ")}\n`);
+        stream.write("=".repeat(80));
+        stream.write("\n\n");
+      }
       const exitCode = await runCommand("docker", {
         args: [...dockerArgs],
         outputHandler: (data, opts) => {
           const dataStr = data.toString();
           dataStr.split("\n").forEach(line => {
-            process.stdout.write(`${dockerTarget}: ${line}\n`);
+            if (!logsDir) {
+              process.stdout.write(`${color.green(dockerTarget)}: ${line}\n`);
+            }
+            if (stream) {
+              stream.write(`${line}\n`);
+            }
           });
         },
       });
+      if (stream) {
+        stream.write("=".repeat(80));
+        stream.write("\n\n");
+        stream.end();
+      }
       if (exitCode != 0) {
         throw new Error(`Docker build failed with exit code ${exitCode}`);
       }
diff --git a/package.json b/package.json
@@ -3,7 +3,7 @@
   "version": "0.0.0",
   "private": false,
   "scripts": {
-    "build-scripts": "cd cli/build-scripts && pnpm run exec",
+    "build-scripts": "pnpm --filter ./cli/build-scripts run exec",
     "format:check": "prettier --ignore-unknown --check --config ./.prettierrc.json --ignore-path ./.prettierignore $(git diff --name-only --diff-filter d | xargs)",
     "format:check:all": "prettier --check --config ./.prettierrc.json --ignore-path ./.prettierignore .",
     "format": "prettier --ignore-unknown --write --config ./.prettierrc.json --ignore-path ./.prettierignore $(git diff --name-only --diff-filter d | xargs)",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+import { createColors } from "colorette";`
	`2`	`+`
	`3`	`+export const color = createColors();`