@leverege/build-tools 2.63.0 → 2.63.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leverege/build-tools",
-  "version": "2.63.0",
+  "version": "2.63.1",
   "description": "A collection of build / support tools for Leverege developers",
   "main": "index.js",
   "repository": {
@@ -60,7 +60,6 @@
   "author": "Leverege Devs",
   "license": "SEE LICENSE IN LICENSE.md",
   "dependencies": {
-    "@google-cloud/artifact-registry": "^3.5.0",
     "@leverege/jsdoc-template": "^1.0.1",
     "chalk": "^5.4.1",
     "command-line-args": "^6.0.1",

package/src/build-cnpg-image.mjs

@@ -3,7 +3,8 @@
 // A simple utility for easily building CNPG based psql images. The resultant
 // image will contain PostgreSQL, the JS query and Timescale extensions, and
 // the extensions that are required by CNPG like barman, pgaudit, pgvector and
-// pg-failover-slots.
+// pg-failover-slots. The docker image will be built using GCP Cloud Build in
+// order to create an image that is k8s friendly.
 //
 // Latest Versions:
 //   postgres    => https://www.postgresql.org/
@@ -11,6 +12,7 @@
 //   CNPG images => https://github.com/cloudnative-pg/postgres-containers/pkgs/container/postgresql
 
 import fs from 'node:fs'
+import os from 'node:os'
 import path from 'node:path'
 
 import chalk from 'chalk'
@@ -122,25 +124,22 @@ const buildAndPushImage = async () => {
   const renderedDockerfile = template( { PG_VERSION } )
   debug( { renderedDockerfile }, '<==Dockerfile' )
 
-  // Write the Dockerfile to a temporary location
-  const buildDir = './build-tmp'
-  fs.mkdirSync( buildDir )
-  const dockerfilePath = path.resolve( `${buildDir}/Dockerfile` )
-  fs.writeFileSync( dockerfilePath, renderedDockerfile )
-
-  // Build the image
-  log( chalk.yellow( '\nBuilding Docker image...' ) )
-  const cloudBuildSubmit = 'gcloud builds submit --project leverege-registry'
-  const cloudBuildLog = '--gcs-log-dir gs://leverege-registry_cloudbuild/log'
-  const imageTag = `--tag ${LEVEREGE_IMAGE_NAME_WITH_TAG}`
-  await shellCmd( `${cloudBuildSubmit} ${cloudBuildLog} ${imageTag} ${buildDir}`, { stdio : 'inherit' } )
-
-  // Push the image
-  //log( chalk.green( '\nPushing Docker image...' ) )
-  //await shellCmd( `docker push ${LEVEREGE_IMAGE_NAME_WITH_TAG}`, { stdio : 'inherit' } )
-
-  // Clean up the temporary Dockerfile
-  fs.rmdirSync( buildDir, { recursive : true } )
+  // Create a temporary directory to build from
+  const buildDir = fs.mkdtempSync( path.join( os.tmpdir(), 'docker-build-' ) )
+  const dockerfilePath = path.join( buildDir, 'Dockerfile' )
+
+  try {
+    fs.writeFileSync( dockerfilePath, renderedDockerfile )
+
+    log( chalk.yellow( '\nBuilding Docker image...' ) )
+    const cloudBuildSubmit = 'gcloud builds submit --project leverege-registry'
+    const cloudBuildLog = '--gcs-log-dir gs://leverege-registry_cloudbuild/log'
+    const imageTag = `--tag ${LEVEREGE_IMAGE_NAME_WITH_TAG}`
+    await shellCmd( `${cloudBuildSubmit} ${cloudBuildLog} ${imageTag} ${buildDir}`, { stdio : 'inherit' } )
+  } finally {
+    // Ensure cleanup even if the build fails
+    fs.rmSync( buildDir, { recursive : true, force : true } )
+  }
 }
 
 // Main execution flow

package/src/chart-compass.mjs

@@ -100,7 +100,7 @@ if ( args.init ) {
     errorExit( `\n***ERROR: ${args.compass} compass file already exists - not overwriting` )
   }
 
-  const copyOut = await shellCmd( `cp ${BUILD_TOOLS_ROOT}/chart-compass.yaml ${args.compass}` )
+  await shellCmd( `cp ${BUILD_TOOLS_ROOT}/chart-compass.yaml ${args.compass}` )
   log( '\nBootstrapped a new chart compass defition => ', chalk.green.bold( args.compass ) )
   process.exit( 0 )
 }