@leverege/build-tools 2.61.6 → 2.62.0-alpha.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leverege/build-tools",
-  "version": "2.61.6",
+  "version": "2.62.0-alpha.1",
   "description": "A collection of build / support tools for Leverege developers",
   "main": "index.js",
   "repository": {
@@ -16,13 +16,14 @@
   "bin": {
     "build-tools": "src/build-tools.mjs",
     "build-and-push": "src/build-and-push.sh",
-    "build-cnpg-image": "src/build-cnpg-image.mjs",
     "chart-to-registry": "src/chart-to-registry.mjs",
     "circleate": "src/circleate.sh",
+    "cnpg-backup": "src/cnpg-backup.mjs",
     "decrypt-secrets": "src/decrypt-secrets.sh",
     "dirty-git": "src/dirty-git.sh",
     "dockreate": "src/dockreate.sh",
     "docker-to-registry": "src/docker-to-registry.mjs",
+    "docker-to-registry.sh": "src/docker-to-registry.sh",
     "encrypt-secrets": "src/encrypt-secrets.sh",
     "firebaseDeploy": "src/firebaseDeploy.mjs",
     "firebaseServe": "src/firebaseServe.mjs",
@@ -36,7 +37,9 @@
     "helminit": "src/helmup.sh",
     "helmwhat": "src/helmup.sh",
     "hook-and-release": "src/hook-and-release.mjs",
+    "k8cryo": "src/k8cryo.sh",
     "k8scale": "src/k8scale.sh",
+    "k8thaw": "src/k8cryo.sh",
     "k8x": "src/k8x.sh",
     "klog": "src/klog.sh",
     "npm-link": "src/npm-link.sh",
@@ -50,7 +53,6 @@
     "refresh-npm-token": "src/refresh-npm-token.mjs",
     "refresh-py-idx": "src/refresh-py-idx.sh",
     "send-to-slack": "src/send-to-slack.mjs",
-    "snapshot-cnpg": "src/snapshot-cnpg.mjs",
     "tag-release": "src/tag-release.mjs",
     "unleash": "src/unleash.mjs"
   },
@@ -59,25 +61,28 @@
   "dependencies": {
     "@google-cloud/artifact-registry": "^3.5.0",
     "@leverege/jsdoc-template": "^1.0.1",
+    "ansi-colors": "^4.1.3",
     "chalk": "^5.4.1",
     "command-line-args": "^6.0.1",
     "command-line-usage": "^7.0.3",
     "deepmerge": "^4.3.1",
     "enquirer": "^2.4.1",
     "execa": "^9.5.2",
-    "glob": "^11.0.1",
+    "glob": "^11.0.0",
     "handlebars": "^4.7.8",
-    "inquirer": "^12.3.3",
+    "inquirer": "^12.3.0",
     "js-yaml": "^4.1.0",
     "jsdoc": "^4.0.4",
     "ms": "^2.1.3",
     "npm-registry-fetch": "^18.0.2",
     "package-up": "^5.0.0",
     "parse-gitignore": "^2.0.0",
+    "read-pkg": "^9.0.1",
     "readline-sync": "^1.4.10",
-    "semver": "^7.7.0",
+    "semver": "^7.6.3",
     "simple-git": "^3.27.0",
-    "zx": "^8.3.1"
+    "toml": "^3.0.0",
+    "zx": "^8.3.0"
   },
   "devDependencies": {
     "@leverege/eslint-config-leverege": "^5.0.1",

package/src/Docker.mjs

@@ -24,7 +24,7 @@ const dockerfileNodeVersion = 'jod-alpine'
 // the build-tools repository, but it just became simpler to pull the contents
 // directly into these variables and forego the file loading.
 //
-const dockerfilePluginTemplate = `
+const pluginTemplate = `
 # Dockerfile.plugin - optionally extend the service Docker image
 #
 # This file may be used to run additional docker commands during the image
@@ -38,14 +38,6 @@ const dockerfilePluginTemplate = `
 # Keep in mind that the Alpine Linux base image is used to keep image
 # footprints small, so adding packages "just because" is not considered
 # a best practice.
-`
-const bashrcPluginTemplate = `
-
-# Bashrc.plugin - optionally extend the image .bashrc file
-#
-# This plugin file may contain additional .bashrc settigns / functions to
-# provide on the target image.
-
 `
 const dockerfileTemplate = fs.readFileSync( path.join( DIRNAME, './templates/dockerfileTemplate.hbs' ), 'utf8' )
 const bashrcTemplate = fs.readFileSync( path.join( DIRNAME, './templates/bashrcTemplate.hbs' ), 'utf8' )
@@ -93,31 +85,24 @@ const generateDockerfile = ( options ) => {
     fs.mkdirSync( './docker' ) // TODO: blindly assumes the mkdir succeeds
   }
 
-  // Create a bashrc plugin file if one does not already exist
-  const bashrcPluginFile = './docker/Bashrc.plugin'
-  if ( !fs.existsSync( bashrcPluginFile ) ) {
-    warning( `creating the missing ${bashrcPluginFile} file in the docker directory\n` )
-    fs.writeFileSync( bashrcPluginFile, bashrcPluginTemplate )
-  }
-  const bashrcPlugin = fs.readFileSync( bashrcPluginFile )
-
-  // Build the target bashrc file by using the template plus Bashrc.plugin
   const bashrcFile = './docker/bashrc'
-  if ( fs.existsSync( bashrcFile ) ) {
-    fs.rmSync( bashrcFile ) // start with a clean bashrc
-  }
-
-  try {
-    fs.writeFileSync( bashrcFile, bashrcTemplate )
-    fs.appendFileSync( bashrcFile, bashrcPlugin )
-  } catch ( err ) {
-    errorExit( `***ERROR: failed creation of the ${bashrcFile} file` )
+  // DISABLING exists check. With addition of Bashrc.plugin, the file needs to
+  // always be created or we encounter errors
+  if ( true ) { // !fs.existsSync( bashrcFile ) ) {
+    let bf = bashrcTemplate
+    const bashrcFilePlugin = './docker/Bashrc.plugin'
+    if ( fs.existsSync( bashrcFilePlugin ) ) {
+      const bashrcAdditions = fs.readFileSync( bashrcFilePlugin )
+      bf = `${bf}\n${bashrcAdditions}`
+    }
+    warning( `creating the missing ${bashrcFile} file in the docker directory` )
+    fs.writeFileSync( bashrcFile, bf )
   }
 
   const dockerfilePlugin = './docker/Dockerfile.plugin'
   if ( !fs.existsSync( dockerfilePlugin ) ) {
     warning( `creating the missing ${dockerfilePlugin} file in the docker directory` )
-    fs.writeFileSync( dockerfilePlugin, dockerfilePluginTemplate )
+    fs.writeFileSync( dockerfilePlugin, pluginTemplate )
   }
 
   try {
@@ -129,7 +114,7 @@ const generateDockerfile = ( options ) => {
     errorExit( `***ERROR: expected the ./build directory to exist - ${chalk.yellow( 'npm run build' )}` )
   }
 
-  // At this point the docker plugin file better exist.
+  // At this point the plugin template better exist.
   if ( fs.existsSync( dockerfilePlugin ) ) {
     settings.pluginfile = fs.readFileSync( dockerfilePlugin )
   } else {
@@ -192,8 +177,8 @@ const buildContainerImage = async ( {
   fs.mkdirSync( './build' )
   fs.renameSync( './workspace', buildWorkspace )
   fs.renameSync( './docker/Dockerfile', './build/Dockerfile' )
-  fs.renameSync( './docker/bashrc', './build/bashrc' )
   fs.cpSync( `${process.env.HOME}/.npmrc`, './build/.npmrc' )
+  fs.cpSync( './docker/bashrc', './build/bashrc' )
   fs.cpSync( './package.json', `${buildWorkspace}/package.json` )
   fs.cpSync( './package-lock.json', `${buildWorkspace}/package-lock.json` )
   if ( isNpmWorkspace ) {
@@ -203,7 +188,7 @@ const buildContainerImage = async ( {
   setPreviousBuild( imageVersion ) // update docker/.previous file
 
   const { fullName : builderName } = await getGcpAccount()
-  const gcloudBuild = `gcloud builds submit --project ${artifactProject}`
+  const gcloudBuild = `time gcloud builds submit --project ${artifactProject}`
   const gcloudLogs = `--gcs-log-dir ${formCloudBuildBucketName( artifactProject )}/log`
   let gcloudTags = `--tag ${imageName}:${imageVersion}`
   

package/src/DockerPy.mjs

@@ -0,0 +1,257 @@
+import fs from 'node:fs'
+import path from 'node:path'
+import url from 'node:url'
+
+import chalk from 'chalk'
+import handlebars from 'handlebars'
+
+import {
+  errorExit,
+  getDateTimestamp,
+  getGcpAccount,
+  log,
+  proceed,
+  shellCmd,
+  warning
+} from './Utils.mjs'
+
+const DIRNAME = path.dirname( url.fileURLToPath( import.meta.url ) )
+
+// The contents of these variables were initially located in files that live in
+// the build-tools repository, but it just became simpler to pull the contents
+// directly into these variables and forego the file loading.
+//
+const pluginTemplate = `
+# Dockerfile.plugin - optionally extend the service Docker image
+#
+# This file may be used to run additional docker commands during the image
+# build process without needing to maintain a local custom Dockerfile. For
+# example, uncommenting the following docker RUN command will cause the
+# curl and vim packages to be added to the deployed image thus making them
+# available from the pod's command line on k8s:
+#
+# RUN apk update && apk add --no-cache curl vim
+#
+# Keep in mind that the Alpine Linux base image is used to keep image
+# footprints small, so adding packages "just because" is not considered
+# a best practice.
+`
+const dockerfileTemplate = fs.readFileSync( path.join( DIRNAME, './templates/dockerfileTemplatePy.hbs' ), 'utf8' )
+const cloudBuildSteps = fs.readFileSync( path.join( DIRNAME, './templates/cloudBuildSteps.hbs' ), 'utf8' )
+let bashrcTemplate = fs.readFileSync( path.join( DIRNAME, './templates/bashrcTemplate.hbs' ), 'utf8' )
+const bashrcPyTemplate = fs.readFileSync( path.join( DIRNAME, './templates/bashrcTemplatePy.hbs' ), 'utf8' )
+bashrcTemplate = `${bashrcTemplate}\n${bashrcPyTemplate}`
+
+const defaultSettings = {
+  apkadds : '',
+  date : getDateTimestamp(),
+  nodeimage : 'jod-alpine',
+  imageBase : 'node:jod-alpine',
+  npmlogging : process.env.VERBOSE_NPM_LOGGING ? '--ddd' : '--silent',
+  npmVersion : 'npm@11',
+  pluginfile : '# NO PLUGIN',
+  preInstallPluginfile : '# NO PRE-INSTALL PLUGIN',
+  regvers : 'package.version',
+  runuser : 'python',
+}
+
+const previousFile = './docker/.previous'
+
+function getPreviousBuild() {
+  return fs.existsSync( previousFile ) ? fs.readFileSync( previousFile ) : 'FIRST BUILD'
+}
+
+const setPreviousBuild = ( version ) => {
+  fs.writeFileSync( previousFile, version )
+}
+
+function generateDockerfile( options ) {
+
+  const settings = { ...defaultSettings, ...options }
+
+  if ( !settings.imageBase ) {
+    warning( 'using the default image python:3.12.8-slim-bookworm' )
+    settings.image = 'python:3.12.8-slim-bookworm'
+  } else {
+    settings.image = settings.imageBase
+  }
+  // Ensure the presence of the docker dir with plugin and bashrc - this code
+  // could probably be tightened up a little.
+  try {
+    fs.readdirSync( './docker' )
+  } catch ( err ) {
+    warning( 'creating the missing ./docker directory' )
+    fs.mkdirSync( './docker' ) // TODO: blindly assumes the mkdir succeeds
+  }
+
+  const bashrcFile = './docker/bashrc'
+  let bf = bashrcTemplate
+  const bashrcFilePlugin = './docker/Bashrc.plugin'
+  if ( fs.existsSync( bashrcFilePlugin ) ) {
+    const bashrcAdditions = fs.readFileSync( bashrcFilePlugin )
+    bf = `${bf}\n${bashrcAdditions}`
+  }
+  fs.writeFileSync( bashrcFile, bf )
+
+  const dockerfilePlugin = './docker/Dockerfile.plugin'
+  if ( !fs.existsSync( dockerfilePlugin ) ) {
+    warning( `creating the missing ${dockerfilePlugin} file in the docker directory` )
+    fs.writeFileSync( dockerfilePlugin, pluginTemplate )
+  }
+
+  try {
+    const build = fs.readdirSync( './build' )
+    if ( build.length === 0 ) {
+      errorExit( `***ERROR: the build dir is empty - ${chalk.yellow( 'npm run build' )}` )
+    }
+  } catch ( err ) {
+    errorExit( `***ERROR: expected the ./build directory to exist - ${chalk.yellow( 'npm run build' )}` )
+  }
+
+  // At this point the plugin template better exist.
+  if ( fs.existsSync( dockerfilePlugin ) ) {
+    settings.pluginfile = fs.readFileSync( dockerfilePlugin )
+  } else {
+    errorExit( `***ERROR: something went wrong with ${dockerfilePlugin} plugin creation` )
+  }
+
+  const dockerfilePrePlugin = './docker/DockerfilePreInstall.plugin'
+  if ( fs.existsSync( dockerfilePrePlugin ) ) {
+    settings.preInstallPluginfile = fs.readFileSync( dockerfilePrePlugin )
+  }
+
+  const compiled = handlebars.compile( dockerfileTemplate, { noEscape : true } )
+  const replaced = compiled( settings )
+  // temporarily write the Dockerfile to the docker subdir - the container
+  // image builder will then move it over to the build subdir
+  const dockerfile = './docker/Dockerfile'
+  try {
+    fs.writeFileSync( dockerfile, replaced )
+  } catch ( err ) {
+    errorExit( `***ERROR: failed to write ${dockerfile}\n${err}` )
+  }
+
+  const previousBuild = getPreviousBuild()
+  const dockerInfo = { dockerfile, previousBuild, ...settings }
+  delete dockerInfo.pluginfile
+  return dockerInfo
+}
+
+function formCloudBuildBucketName( artifactProject ) {
+  return `gs://${artifactProject}_cloudbuild`
+}
+
+async function validateCloudBuildBucket( artifactProject ) {
+  const bucketName = formCloudBuildBucketName( artifactProject )
+  log( chalk.green.bold( `Verifying the build bucket exists => ${bucketName}\n` ) )
+  try {
+    await shellCmd( `gsutil ls -p ${artifactProject} -b ${bucketName}` )
+  } catch ( error ) {
+    errorExit( `***Error: from Docker.validateCloudBuildBucket\n\n${chalk.bold.yellow( error )}` )
+  }
+}
+
+async function buildContainerImage( {
+  artifactProject, artifactRegistry, containerName, 
+  imageVersion, isNpmWorkspace, options
+} ) {
+
+  const useCloudBuildFile = true
+  const buildWorkspace = './build/workspace' // passed to Cloud Build
+  const imageName = `${artifactRegistry}/images/${containerName}`
+
+  if ( fs.existsSync( buildWorkspace ) ) {
+    fs.renameSync( buildWorkspace, `${buildWorkspace}-junk` )
+    try {
+      fs.rmSync( `${buildWorkspace}-junk`, { recursive : true } )
+    } catch ( err ) {
+      log( `***Error: from Docker.buildContainerImage\n\n${chalk.bold.yellow( err )}` )
+    }
+  }
+
+  // TODO: This is janky - I'll clean it up later
+  // NOTE: this is dealing with raw filesystem interactions, meaning there
+  //   isn't a shell performing file globbing and what not
+  fs.renameSync( './build', './workspace' )
+  fs.mkdirSync( './build' )
+  fs.renameSync( './workspace', buildWorkspace )
+  fs.renameSync( './docker/Dockerfile', './build/Dockerfile' )
+  // fs.cpSync( `${process.env.HOME}/.npmrc`, './build/.npmrc' )
+  fs.cpSync( './docker/bashrc', './build/bashrc' )
+  // fs.cpSync( './package.json', `${buildWorkspace}/package.json` )
+  // fs.cpSync( './package-lock.json', `${buildWorkspace}/package-lock.json` )
+
+  setPreviousBuild( imageVersion ) // update docker/.previous file
+
+  const { fullName : builderName } = await getGcpAccount()
+  const gcloudBuild = `time gcloud builds submit --project ${artifactProject}`
+  const gcloudLogs = `--gcs-log-dir ${formCloudBuildBucketName( artifactProject )}/log`
+  let gcloudTags = `--tag ${imageName}:${imageVersion}`
+  
+  if ( useCloudBuildFile ) {
+    const cloudBuildFile = './docker/cloudbuild.yaml'
+    gcloudTags = `--config=${cloudBuildFile}`
+    const cbst = handlebars.compile( cloudBuildSteps, { noEscape : true } )
+    const cbs = cbst( { artifactProject, artifactRegistry, imageName, imageVersion } )
+
+    fs.writeFileSync( cloudBuildFile, cbs )
+  }
+
+  log( chalk.green.bold( `
+  *** Submitting Build as ${builderName} ***
+      ${gcloudBuild} \\
+           ${gcloudLogs}  \\
+           ${gcloudTags}
+  ` ) )
+
+  if ( process.env.DRY_RUN === '1' ) {
+    log( '\n***Exiting from DRY_RUN\n' )
+    process.exit( 0 )
+  }
+
+  await shellCmd( `${gcloudBuild} ${gcloudLogs} ${gcloudTags} ./build`, { stdio : 'inherit' } )
+
+  const imageTag = `${defaultSettings.date}-${defaultSettings.nodeimage}-${builderName}`
+  await shellCmd(
+    `gcloud container images add-tag --quiet ${imageName}:${imageVersion} ${imageName}:${imageTag} ${imageName}:latest`
+  )
+}
+
+async function repoCleanup() {
+  // remove garbage from the repo
+  const garbage = [
+    'build',
+    'dist',
+    'docker/.keep',
+    'docker/.npmrc',
+    'docker/.gitignore',
+    'docker/.previous',
+    'docker/Dockerfile',
+    'docker/workspace',
+  ]
+  garbage.forEach( trash => fs.rmSync( trash, { recursive : true, force : true } ) )
+
+  fs.writeFileSync( 'docker/.gitignore', '.previous\nDockerfile' )
+
+  await shellCmd( 'git add -f docker' )
+
+  log( `
+  ${chalk.yellow.bold( '***IMPORTANT***' )}
+
+  Please make the following .gitignore modifications:
+    change /dist to ${chalk.green.bold( '/build' )}
+    remove ${chalk.red.bold( '/docker' )}
+` )
+
+  await proceed( 'Acknowledge the .gitignore mods were made?' )
+}
+
+export default {
+  getPreviousBuild,
+  setPreviousBuild,
+  generateDockerfile,
+  formCloudBuildBucketName,
+  validateCloudBuildBucket,
+  buildContainerImage,
+  repoCleanup,
+}

package/src/Utils.mjs

@@ -54,10 +54,6 @@ export const isString = ( s ) => {
  * General "yes" to proceed function.
  */
 export const proceed = async ( query = 'Do you wish to proceed?' ) => {
-  if ( process.env.CICD_PIPELINE === '1' ) {
-    log( '\n*** CICD Pipeline - skipping user prompts' )
-    return
-  }
   await inquirer.prompt( [
     {
       type : 'confirm',
@@ -403,7 +399,6 @@ export const getRepositoryDescr = async () => {
   const currentDir = process.cwd()
   const workingDir = process.env.PWD
   const gitRoot = await getGitRootDirectory()
-  const isGitRepo = gitRoot !== undefined
   const gitHooksPath = await getGitHooksPath()
   const { branch : gitBranch, upstream : gitUpstream } = await getGitBranchAndUpstream()
   const subPkgs = await glob( `${gitRoot}/packages/**/package.json`, { ignore : '/**/node_modules/**' } )
@@ -425,7 +420,6 @@ export const getRepositoryDescr = async () => {
     gitRoot,
     gitUpstream,
     helmChart,
-    isGitRepo,
     isMonoRepo,
     isNpmWorkspace,
     rootPackageJson,

package/src/bash-funcs

@@ -42,10 +42,6 @@ function clearlyWarn() {
 CLEARWARN
 }
 
-function warning() {
-  clearlyWarn DO_NOT_CLEAR
-}
-
 function warnOnError() {
   [ $1 -ne 0 ] && printf "\n$YELO_WARN $2\n"
 }

package/src/docker-to-registry-py.mjs

@@ -0,0 +1,291 @@
+#!/usr/bin/env node
+/*
+ * docker-to-registry-py will...
+ */
+import fs from 'node:fs'
+import toml from 'toml'
+import chalk from 'chalk'
+import semver from 'semver'
+
+import {
+  debug, log,
+  errorExit,
+  getGitBranchAndUpstream,
+  gitRepoIsDirty,
+  parseHelmChart,
+  proceed,
+  shellCmd } from './Utils.mjs'
+
+import Docker from './DockerPy.mjs'
+import { version } from 'node:os'
+
+// refresh-npm-token does not throw so no need to try, but it emits in debug
+const refreshErr = await shellCmd( 'refresh-npm-token' )
+if ( refreshErr && !process.env.BUILD_TOOLS_DEBUG ) {
+  log( refreshErr ) // most likely the token refreshed message
+}
+
+const options = {}
+let imageVersion = null
+// Expected to be invoked like docker-to-registry-py v1.2.3
+for ( let n = 2; n < process.argv.length; n++ ) {
+  if ( process.argv[n].startsWith( '-' ) ) {
+    const str = process.argv[n].slice( 1 )
+    if ( str.indexOf( '=' ) > 0 ) {
+      const [ key, value ] = str.split( '=' )
+      options[key] = value
+    } else {
+      options[str] = true
+    }
+  } else {
+    imageVersion = process.argv[n]
+  }
+}
+if ( !imageVersion ) {
+  errorExit( '***Error: docker-to-registry-py requires an image version' )
+}
+
+// may use guide-me or guideme to ask for update guidance
+const giveGuidance = imageVersion.match( /^guide-*me$/ ) !== null
+
+const willGitTag = imageVersion.match( /^v\d+\.\d+\.\d+$/ )
+const tagInfo = willGitTag ?
+  chalk.yellow.bold( 'will be git tagged' ) :
+  chalk.red( 'BETA RELEASE WILL NOT BE GIT TAGGED' )
+
+const repoIsDirty = await gitRepoIsDirty()
+
+if ( willGitTag && repoIsDirty ) {
+  log( `
+  ${chalk.red.bold( '***ERROR: attempting to tag a non-beta dirty git repository' )}
+
+  You are attempting to create a tagged release image for pushing to the
+  artifact registry, but there are locally modified files. This is not
+  allowed since the applied tag will not be relevant to the image version
+  due to the pending commits.
+
+  Available options for proceeding:
+
+    ${chalk.green.bold( '1) cleanly commit all local mods assuming relevance' )}
+    ${chalk.yellow( '2) eliminate unwanted local modifications' )}
+    ${chalk.red( '3) stash anything that is irrelevant to this release' )}
+
+  ` )
+  process.exit( 1 )
+}
+
+if ( !fs.existsSync( './helm' ) ) {
+  log( `
+  ${chalk.red.bold( '***Error: docker-to-registry-py requires a helm chart directory' )}
+
+  The docker-to-registry-py script expects to run in the root directory of a k8s
+  service, which requires a helm chart directory. It also expects a docker
+  directory but will build that if it does not exist.
+
+  ` )
+  process.exit( 1 )
+}
+
+const tomlStr = fs.readFileSync( './pyproject.toml' )
+const pyproject = toml.parse( tomlStr )
+const repoDescr = {
+  artifactProject : pyproject.leverege.project || 'leverege-registry',
+  containerName : pyproject.project.name,
+  packageVersion : pyproject.project.version,
+  artifactRegistry : pyproject.leverege.registry || 'us-docker.pkg.dev/leverege-registry/stack',
+  registryFolder : `${pyproject.leverege.registryFolder}/images/${pyproject.project.name}`,
+  imageBase : pyproject.leverege.imageBase,
+  helmChart : await parseHelmChart(),
+}
+
+debug( { repoDescr }, '<==The Repo Description' )
+
+const dockerInfo = await Docker.generateDockerfile( {
+  regvers : repoDescr.packageVersion,
+  imageBase : repoDescr.imageBase,
+} )
+
+debug( { dockerInfo }, '<==The Docker Info' )
+
+const {
+  artifactProject,
+  artifactRegistry,
+  packageVersion,
+  containerName,
+  helmChart,
+} = repoDescr
+
+if ( giveGuidance ) {
+  await Docker.validateCloudBuildBucket( artifactProject )
+}
+
+const registryFolder = `${artifactRegistry}/images/${containerName}`
+
+// Update the dependencies...
+log( chalk.green.bold( 'Updating dependencies and workspace...' ) )
+await shellCmd( 'npm install', { stdio : 'inherit' } )
+
+if ( giveGuidance ) {
+  await Docker.repoCleanup() // adjusts gitignore files and removes cruft
+  log( `
+
+
+
+  ${chalk.green.bold( '-------------------- Potential Helm Chart Mods --------------------' )}
+
+  Moving to the new artifact-registry for docker image storage may also require
+  helm chart changes depending on how old the current charts are. Charts that
+  contain helm/values.yaml files resembling this:
+
+  ${chalk.yellow.bold( `serviceConfig:
+    VERSION: v1.2.3
+    PREEMPTIBLE: true` )}
+
+  are pre-ignition era charts and should be replaced with the latest helm chart
+  templates available from ignition. Either dive in or ask devops for a hand
+  when converting these legacy / deprecated charts.
+
+
+  More recently updated helm charts that have already started the migration to
+  the new approach may already have registry entries like this:
+
+  ${chalk.yellow.bold( `image:
+    registry: gcr.io/leverege-docker-images
+    tag: ""` )}
+
+  The above registry statement references the deprecated container registry and
+  must be adjusted accordingly to resemble:
+
+    ${chalk.green.bold( 'registry: us-docker.pkg.dev/leverege-registry/<registry folder>/images' )}
+
+  There may also be a corresponding modification needed in the helm template
+  deployment.yaml file in the container image spec:
+
+    ${chalk.green.bold( 'image: {{ .Values.image.registry }}/{{ .Chart.Name }}:{{ default .Chart.AppVersion .Values.image.tag }}' )}
+
+
+  ${chalk.magenta.bold( `Upgrading all service charts to the latest ignition template chart structure
+  is the preferred approach to making the transition to the artifact registry.` )}
+
+  ` )
+  log( chalk.green.bold( '*** docker-to-registry-py guidance complete - ready for dockerization ***' ) )
+  process.exit( 0 )
+}
+
+// do chart checks too
+let chart
+if ( options?.helmChecks !== 'false' ) {
+  chart = helmChart?.yaml['Chart.yaml']
+  const values = helmChart?.yaml['values.yaml']
+  const expectedChartRegistry = `${artifactRegistry}/images`
+
+  if ( expectedChartRegistry !== values.image?.registry ) {
+    log( `
+  ${chalk.red.bold( '***Error: mismatched package.json registry and helm/values.yaml' )}
+
+  The registry specified in the package.json leverege stanza does not line up
+  with the image registry in helm/values.yaml. The naming convention expects
+  the '/images' suffix to be added to the package.json registry string and then
+  stored as the image.registry in the helm/values.yaml file.
+
+    Current settings:
+      package.json registry => ${chalk.yellow.bold( artifactRegistry )}
+      values.yaml  registry => ${chalk.red.bold( values.image?.registry )}
+
+    Expected settings:
+      values.yaml  registry => ${chalk.green.bold( expectedChartRegistry )}
+  ` )
+
+    if ( !values.image ) {
+      log( `
+  ${chalk.yellow.bold( '***DEPRECATED: legacy helm charts detected' )}
+
+  The helm chart structure appears to be based on the pre-ignition helm chart
+  layouts. The charts must be upgraded before docker-to-registry-py can complete
+  its job.
+
+    ` )
+    }
+
+    process.exit( 1 )
+  }
+}
+
+// Give the summary and the user a chance to proceed or not
+log( `
+  ${chalk.green.bold( 'Build Information:' )}
+    Container:     ${chalk.green.bold( containerName )}
+    Version:       ${chalk.green.bold( imageVersion )}   ${tagInfo}
+    Registry:      ${chalk.green.bold( artifactRegistry )}
+    Image Folder:  ${chalk.yellow.bold( registryFolder )}
+
+  ${chalk.green.bold( 'Docker Information:' )}
+    NodeImage:     ${chalk.green.bold( dockerInfo.imageBase || `node:${dockerInfo.nodeimage}` )}
+    Docker Env:    ${chalk.green.bold( dockerInfo.buildEnv || 'alpine' )}
+    AddedPkgs:     ${chalk.green.bold( dockerInfo.apkadds )}
+    Run User:      ${chalk.green.bold( dockerInfo.runuser )}
+    Previous:      ${chalk.yellow.bold( dockerInfo.previousBuild )}
+    DateStamp:     ${chalk.green.bold( dockerInfo.date )}
+    NPM Logs:      ${chalk.green.bold( dockerInfo.npmlogging )}
+    NPM Version:   ${chalk.green.bold( dockerInfo.npmVersion )}
+` )
+
+if ( imageVersion !== packageVersion ) {
+  log( `
+  ${chalk.yellow.bold( '***WARNING: specified version does not match project version' )}
+        pyproject.toml => ${chalk.green.bold( packageVersion )}
+        specified    => ${chalk.red.bold( imageVersion )}
+  ` )
+
+  if ( willGitTag ) {
+    log( chalk.red.bold( '... and you are attempting to release so NOPE!\n' ) )
+    process.exit( 1 )
+  }
+}
+
+const repoInfo = await getGitBranchAndUpstream()
+
+if ( willGitTag && !repoInfo.upstream ) {
+  log( `
+  ${chalk.red.bold( '***ERROR: the current branch must have an upstream' )}
+
+  You are attempting to create a tagged release image for pushing to the
+  container registry, but the current branch does not have an upstream to
+  push to. This is not allowed since the applied tag will be stranded here
+  in your local repository, which is what we are trying to avoid.
+
+  Available options for proceeding:` )
+  log( chalk.green.bold( `
+    1) set an upstream for this branch via:
+           git push --set-upstream origin ${repoInfo.branch}` ) )
+  log( chalk.yellow.bold( `
+    2) rebase, squash and merge onto a branch with an upstream` ) )
+
+  process.exit( 1 )
+}
+
+if ( willGitTag ) {
+  if ( chart.appVersion !== imageVersion ) {
+    log( `
+  ${chalk.yellow.bold( '***WARNING: the helm/Chart.yaml appVersion does not align with the build version' )}
+    chart appVersion => ${chalk.yellow.bold( chart.appVersion )}
+    build version    => ${chalk.green.bold( imageVersion )}
+  ` )
+  }
+}
+
+await proceed()
+
+log( chalk.green.bold( 'Building the Docker Image...' ) )
+await Docker.buildContainerImage( { ...repoDescr, options, imageVersion } )
+log( chalk.blue.bold( 'Done Building the Docker Image...' ) )
+
+if ( willGitTag ) {
+  const tagDescription = `docker_${imageVersion}`
+  const fullImageTag = repoDescr.isMonoRepo ? `${repoDescr.containerName}/${imageVersion}` : imageVersion
+  log( chalk.green.bold( `Tagging and Pushing ${fullImageTag}\n` ) )
+  await shellCmd( `git tag -f ${fullImageTag} -m ${tagDescription}` )
+  await shellCmd( 'git push --follow-tags' )
+} else {
+  log( chalk.yellow.bold( '\n*** Skipped git tagging - beta release' ) )
+}

package/src/docker-to-registry.sh

@@ -19,7 +19,7 @@ cat<<DEPRECATED_TOOL
   `color y "***DEPRECATED docker-to-registry.sh - upgrade to docker-to-registry.mjs***"`
 
 DEPRECATED_TOOL
-exit 1
+sleep 3
 
 PKGTOP="$npm_config_local_prefix"
 cd $PKGTOP/docker

package/src/helm-charts/cnpg-db-pgbench/cluster.yaml.ovh

@@ -1,3 +1,5 @@
+# Artifact Chart  => https://artifacthub.io/packages/helm/cloudnative-pg/cloudnative-pg
+# Examples Charts => https://cloudnative-pg.io/documentation/current/samples/
 apiVersion: postgresql.cnpg.io/v1
 kind: Cluster
 metadata:
@@ -8,7 +10,7 @@ spec:
   logLevel: info # warning debug
 
   description: "Leverege PG Bench Timescale DB"
-  imageName: us-docker.pkg.dev/leverege-registry/system/images/leverege-pgsql:17.2-cnpg-lvrg-rel.2
+  imageName: us-docker.pkg.dev/leverege-registry/system/images/leverege-pgsql:16.1-cnpg-tsdb2-beta.6
   bootstrap:
     initdb:
       postInitTemplateSQL:
@@ -58,7 +60,6 @@ spec:
   # - supervised: requires manual supervision to perform
   #               the switchover of the primary
   primaryUpdateStrategy: unsupervised
-  primaryUpdateMethod: switchover
 
   serviceAccountTemplate:
     metadata:

package/src/helm-charts/cnpg-db-psql-stack/cluster.yaml.ovh

@@ -1,3 +1,5 @@
+# Artifact Chart  => https://artifacthub.io/packages/helm/cloudnative-pg/cloudnative-pg
+# Examples Charts => https://cloudnative-pg.io/documentation/current/samples/
 apiVersion: postgresql.cnpg.io/v1
 kind: Cluster
 metadata:
@@ -11,7 +13,7 @@ spec:
     enablePodMonitor: false # set true once monitoring is setup
 
   description: "Leverege Stack PostgreSQL DB"
-  imageName: us-docker.pkg.dev/leverege-registry/system/images/leverege-pgsql:17.2-cnpg-lvrg-rel.2
+  imageName: us-docker.pkg.dev/leverege-registry/system/images/leverege-pgsql:16.4-cnpg-tsdb2-rel.1
   bootstrap:
     initdb:
 #     database: models # do not set - let it default to cnpg app db
@@ -64,7 +66,6 @@ spec:
   # - supervised: requires manual supervision to perform
   #               the switchover of the primary
   primaryUpdateStrategy: unsupervised
-  primaryUpdateMethod: switchover
 
   serviceAccountTemplate:
     metadata:

package/src/helm-charts/cnpg-db-recovery/cluster.yaml.ovh

@@ -1,3 +1,5 @@
+# Artifact Chart  => https://artifacthub.io/packages/helm/cloudnative-pg/cloudnative-pg
+# Examples Charts => https://cloudnative-pg.io/documentation/current/samples/
 apiVersion: postgresql.cnpg.io/v1
 kind: Cluster
 metadata:
@@ -11,7 +13,7 @@ spec:
     enablePodMonitor: false # set true once monitoring is setup
 
   description: "Leverege CNPG DB (recovered)"
-  imageName: us-docker.pkg.dev/leverege-registry/system/images/leverege-pgsql:17.2-cnpg-lvrg-rel.2
+  imageName: us-docker.pkg.dev/leverege-registry/system/images/leverege-pgsql:16.4-cnpg-tsdb2-rel.1
   bootstrap:
     recovery:
       volumeSnapshots:
@@ -59,7 +61,6 @@ spec:
   # - supervised: requires manual supervision to perform
   #               the switchover of the primary
   primaryUpdateStrategy: unsupervised
-  primaryUpdateMethod: switchover
 
   serviceAccountTemplate:
     metadata:

package/src/helm-charts/cnpg-db-tsdb-basic/cluster.yaml.ovh

@@ -1,3 +1,5 @@
+# Artifact Chart  => https://artifacthub.io/packages/helm/cloudnative-pg/cloudnative-pg
+# Examples Charts => https://cloudnative-pg.io/documentation/current/samples/
 apiVersion: postgresql.cnpg.io/v1
 kind: Cluster
 metadata:
@@ -11,7 +13,7 @@ spec:
     enablePodMonitor: false # set true once monitoring is setup
 
   description: "Leverege Plain Timescale DB"
-  imageName: us-docker.pkg.dev/leverege-registry/system/images/leverege-pgsql:17.2-cnpg-lvrg-rel.2
+  imageName: us-docker.pkg.dev/leverege-registry/system/images/leverege-pgsql:16.4-cnpg-tsdb2-rel.1
   bootstrap:
     initdb:
 #     database: imagine # let it default to cnpg app db
@@ -72,7 +74,6 @@ spec:
   # - supervised: requires manual supervision to perform
   #               the switchover of the primary
   primaryUpdateStrategy: unsupervised
-  primaryUpdateMethod: switchover
 
   serviceAccountTemplate:
     metadata:

package/src/helm-charts/cnpg-db-tsdb-dense/cluster.yaml.ovh

@@ -1,3 +1,5 @@
+# Artifact Chart  => https://artifacthub.io/packages/helm/cloudnative-pg/cloudnative-pg
+# Examples Charts => https://cloudnative-pg.io/documentation/current/samples/
 apiVersion: postgresql.cnpg.io/v1
 kind: Cluster
 metadata:
@@ -11,7 +13,7 @@ spec:
     enablePodMonitor: false # set true once monitoring is setup
 
   description: "Leverege Dense Timescale DB"
-  imageName: us-docker.pkg.dev/leverege-registry/system/images/leverege-pgsql:17.2-cnpg-lvrg-rel.2
+  imageName: us-docker.pkg.dev/leverege-registry/system/images/leverege-pgsql:16.4-cnpg-tsdb2-rel.1
   bootstrap:
     initdb:
       postInitTemplateSQL:
@@ -67,7 +69,6 @@ spec:
   # - supervised: requires manual supervision to perform
   #               the switchover of the primary
   primaryUpdateStrategy: unsupervised
-  primaryUpdateMethod: switchover
 
   serviceAccountTemplate:
     metadata:

package/src/helm-charts/prom-operator/helmup.plugin

@@ -4,23 +4,20 @@ showInstalling "The Prometheus Operator and Components"
 addHelmRepo prometheus-community https://prometheus-community.github.io/helm-charts
 
 showInstalling "The Prometheus Operator (kube-prometheus-stack)"
-[ -z "$PROMETHEUS_STACK_CHART_VERSION" ] && PROMETHEUS_STACK_CHART_VERSION="68"
+[ -z "$PROMETHEUS_STACK_CHART_VERSION" ] && PROMETHEUS_STACK_CHART_VERSION="67"
 
 NS="--namespace prometheus"
 
-# https://artifacthub.io/packages/helm/prometheus-community/kube-prometheus-stack
 helm upgrade $NS --install prometheus-stack prometheus-community/kube-prometheus-stack \
                  --values  prom-operator/prometheus-stack.yaml \
                  --version $PROMETHEUS_STACK_CHART_VERSION $HELM_WHAT
 
-# https://artifacthub.io/packages/helm/prometheus-community/prometheus-elasticsearch-exporter
 showInstalling "The Elasticsearch Exporter (prom-operator)"
 [ -z "$ELASTICSEARCH_EXPORTER_CHART_VERSION" ] && ELASTICSEARCH_EXPORTER_CHART_VERSION="6"
 helm upgrade $NS --install elasticsearch8-exporter prometheus-community/prometheus-elasticsearch-exporter \
                  --values prom-operator/elasticsearch-exporter.yaml \
                  --version $ELASTICSEARCH_EXPORTER_CHART_VERSION $HELM_WHAT
 
-# https://artifacthub.io/packages/helm/prometheus-community/prometheus-stackdriver-exporter
 showInstalling "The Stackdriver Exporter (prom-operator)"
 [ -z "$STACKDRIVER_EXPORTER_CHART_VERSION" ] && STACKDRIVER_EXPORTER_CHART_VERSION="4"
 helm upgrade $NS --install stackdriver-exporter prometheus-community/prometheus-stackdriver-exporter \

package/src/hook-and-release/Config.mjs

@@ -128,15 +128,6 @@ export default class Config {
 
   async bootstrapHookAndRelease() {
     const repoDescr = await getRepositoryDescr()
-    if ( !repoDescr.isGitRepo ) {
-      const notGitRepo = `
-  The hook-and-release script only works with git repositories. Try running:
-
-      git init && hook-and-release --init
-
-  to initialize git and hook-and-release.`
-      errorExit( notGitRepo )
-    }
     this.gitRoot = repoDescr.gitRoot
     this.gitBranch = repoDescr.gitBranch
     this.gitHooksPath = repoDescr.gitHooksPath

package/src/templates/bashrcTemplatePy.hbs

@@ -0,0 +1 @@
+export PYTHONPYCACHEPREFIX=/tmp/pycache

package/src/templates/dockerfileTemplate.hbs

@@ -25,11 +25,11 @@ COPY ./.npmrc ${NPM_CONFIG_USERCONFIG}
 RUN if [ "${BUILD_ENV}" = "debian" ]; then \
       apt-get update && \
       apt-get install -y wget openssh-client build-essential && \
-      npm install -g {{npmVersion}}; \
+      npm install -g npm@10; \
     else \
       apk --no-cache add openssh-client && \
       apk --update add --no-cache --virtual build-dep g++ gcc libgcc libstdc++ linux-headers make {{apkadds}} && \
-      npm install -g {{npmVersion}}; \
+      npm install -g npm@10; \
     fi
 
 # Use SKIP_PREPARE to disable hook-and-release from running
@@ -58,13 +58,13 @@ COPY ./.npmrc ${NPM_CONFIG_USERCONFIG}
 RUN if [ "$BUILD_ENV" = "debian" ]; then \
       apt-get update && \
       apt-get install -y tini bash curl vim {{apkadds}} && \
-      npm install -g {{npmVersion}} && \
+      npm install -g npm@10 && \
       rm /bin/sh && ln -s /bin/bash /bin/sh && \
       mkdir -p /usr/src/app /tmp/levlog && chown node:node /usr/src/app; \
     else \
       apk update && \
       apk add --no-cache bash curl tini vim {{apkadds}} && \
-      npm install -g {{npmVersion}} && \
+      npm install -g npm@10 && \
       rm /bin/sh && ln -s /bin/bash /bin/sh && \
       mkdir -p /usr/src/app /tmp/levlog && chown node:node /usr/src/app; \
     fi
@@ -83,4 +83,4 @@ COPY --chown=node:node --from=intermediate /usr/src/app /usr/src/app
 
 USER {{runuser}}
 COPY ./bashrc /home/node/.bashrc
-CMD [ "/bin/bash", "-c", "source /home/node/.bashrc && node index.js" ]
+CMD [ "/bin/bash", "-c", "source /home/node/.bashrc && node index.js" ]

package/src/templates/dockerfileTemplatePy.hbs

@@ -0,0 +1,75 @@
+# Version {{regvers}} @ {{date}}
+
+# The FROM directive sets the Base Image for subsequent instructions
+FROM {{image}} as intermediate
+
+ARG BUILD_ENV="{{buildEnv}}"
+
+RUN apt-get update && apt-get install -y \
+    wget
+#    gcc \
+#    git \
+#    libgl1 \
+#    libglib2.0-0 \
+#    && rm -rf /var/lib/apt/lists/*
+
+# Copy uv binary from the official distroless Docker image.
+COPY --from=ghcr.io/astral-sh/uv:latest /uv /bin/uv
+
+# Define the working directory.
+WORKDIR /usr/src/app
+
+#ENV NODE_ENV production
+#ENV NPM_CONFIG_USERCONFIG /usr/src/app/.npmrc
+
+RUN mkdir -p /usr/src/app
+WORKDIR /usr/src/app
+
+# Install app dependencies
+COPY ./workspace/ /usr/src/app/
+ENV GRPC_VERBOSITY ERROR
+
+
+# Setup pip.conf for Google Artifact Registry.
+RUN mkdir -p ~/.config/pip
+RUN echo "[global]" >> ~/.config/pip/pip.conf && \
+    echo "break-system-packages = true" >> ~/.config/pip/pip.conf 
+
+
+# Set up the virtual environment.
+RUN uv venv
+ENV VIRTUAL_ENV=/usr/src/app/.venv
+ENV PATH="$VIRTUAL_ENV/bin:$PATH"
+
+# Setup keyring for Google Artifact Registry.
+RUN uv pip install keyring
+RUN uv pip install keyrings.google-artifactregistry-auth
+
+RUN echo "extra-index-url = https://oauth2accesstoken@us-python.pkg.dev/leverege-registry/leverege-python-packages/simple" >> ~/.config/pip/pip.conf
+
+ENV UV_EXTRA_INDEX_URL "https://oauth2accesstoken@us-python.pkg.dev/leverege-registry/leverege-python-packages/simple"
+
+
+{{preInstallPluginfile}}
+
+RUN cat 
+
+RUN ls -al
+# Install uv
+RUN uv sync --keyring-provider subprocess --extra-index-url https://oauth2accesstoken@us-python.pkg.dev/leverege-registry/leverege-python-packages/simple
+
+
+# Pull in the Dockerfile.plugin file here
+{{pluginfile}}
+
+# Eliminate the sensitive info from the final stage image
+#RUN rm -f ${NPM_CONFIG_USERCONFIG}
+
+# ENTRYPOINT [ "tini", "--" ]
+#WORKDIR /usr/src/app
+
+#COPY --chown=node:node --from=intermediate /usr/src/app /usr/src/app
+
+USER {{runuser}}
+COPY ./bashrc /home/{{runuser}}/.bashrc
+CMD [ "/bin/bash", "-c", "source /home/{{runuser}}/.bashrc && python scripts/server.py" ]

package/registry-compass.yaml

@@ -1,20 +0,0 @@
-registry:
-  - root: us-docker.pkg.dev
-  - repositories:
-    - name: stack
-      charts:
-        - api-server
-        - authz-server
-        - emailer
-        - message-processor
-    - name: leverege
-      charts:
-        - pubsub-pulse
-        - pusher
-        - overdose
-    - name: cox-health
-      charts:
-        - actions-server
-        - analytics-server
-        - centrak-healthz
-        - centrak-ingestor

package/src/build-cnpg-image.mjs

@@ -1,176 +0,0 @@
-#!/usr/bin/env node
-
-// 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.
-//
-// Latest Versions:
-//   postgres    => https://www.postgresql.org/
-//   timescale   => https://docs.timescale.com/about/latest/
-//   CNPG images => https://github.com/cloudnative-pg/postgres-containers/pkgs/container/postgresql
-
-import fs from 'node:fs'
-import path from 'node:path'
-
-import chalk from 'chalk'
-import cliArgs from 'command-line-args'
-import cliHelp from 'command-line-usage'
-import Handlebars from 'handlebars'
-
-import {
-  debug,
-  log,
-  err,
-  errorExit,
-  shellCmd,
-} from './Utils.mjs'
-
-// Define CLI options
-const optionList = [
-  { name : 'sub-tag', type : String, description : '{green sub-tag to add to the image tag (required)}', defaultOption : true },
-  { name : 'pg-version', type : String, description : '{green pgsql version (default: 16.6)}' },
-  { name : 'version', type : Boolean, description : '{green show script version}' },
-  { name : 'help', type : Boolean, description : '{green display this help screen}' },
-]
-
-const sections = [
-  {
-    header : 'Leverege CNPG Docker Image Builder',
-    content : `{green   This tool will build a PostgreSQL based image that is suitable for
-deployment by the CNPG operator. It builds the docker image by using an
-official CNPG docker image as a base and added the jsquery and timescale
-extensions for use within a Leverege k8s cluster. The resultant image may be
-used in the standard PostgreSQL configuration which is used by the stack
-components, as well as timescale based services like transponder tsdb and
-dense history.}`
-  },
-  {
-    header : 'Options',
-    optionList
-  },
-  {
-    header : 'Leverege Registry Image Tag',
-    content : `{green The resultant image will be tagged with a label comprised of the PG version,
-the specified --sub-tag and a fixed string:
-
-    {yellow <PG ver>-cnpg-lvrg-<sub tag>}
-
-For example, version {yellow 16.6} with a sub tag of {yellow rel.1} will be tagged:
-
-    {yellow 16.6-cnpg-lvrg-rel.1}}`
-  },
-]
-const args = cliArgs( optionList, { camelCase : true, partial : true } )
-const help = cliHelp( sections )
-
-debug( { args, help }, '<==Command Line Info?' )
-
-// Show help if needed
-if ( args.help ) {
-  log( help )
-  process.exit( 0 )
-}
-
-// Define defaults
-const PG_VERSION = args.pgVersion || '16.6'
-const { subTag } = args
-if ( !subTag ) {
-  errorExit( 'Error: An image version must be specified.' )
-}
-
-const LEVEREGE_REGISTRY = 'us-docker.pkg.dev/leverege-registry/system/images/leverege-pgsql'
-const LEVEREGE_IMAGE_TAG = `${PG_VERSION}-cnpg-lvrg-${subTag}`
-const LEVEREGE_IMAGE_NAME_WITH_TAG = `${LEVEREGE_REGISTRY}:${LEVEREGE_IMAGE_TAG}`
-
-const DOCKERFILE_TEMPLATE = `
-FROM ghcr.io/cloudnative-pg/postgresql:{{PG_VERSION}}-bookworm
-
-USER root
-
-RUN set -xe; \\
-    apt-get update; \\
-    apt-get install -y --no-install-recommends \\
-        "postgresql-\${PG_MAJOR}-jsquery"; \\
-    rm -fr /tmp/*; \\
-    rm -rf /var/lib/apt/lists/*;
-
-RUN apt-get update \\
-    && apt-get install -y lsb-release wget \\
-    && echo "deb https://packagecloud.io/timescale/timescaledb/debian/ $(lsb_release -c -s) main" | tee /etc/apt/sources.list.d/timescaledb.list \\
-    && wget --quiet -O - https://packagecloud.io/timescale/timescaledb/gpgkey | apt-key add - \\
-    && apt-get update \\
-    && apt-get install -y "timescaledb-2-postgresql-\${PG_MAJOR}" \\
-    && apt-get remove -y lsb-release wget \\
-    && rm -fr /tmp/* \\
-    && rm -rf /var/lib/apt/lists/*;
-
-RUN usermod -u 26 postgres
-USER 26
-`
-
-// Check for existing image
-const checkExistingImage = async ( imageName ) => {
-  const dockerResults = await shellCmd( `docker image list ${imageName} --quiet` )
-  debug( { imageName, dockerResults }, '<==docker image list' )
-  return dockerResults
-}
-
-// Build and push Docker image
-const buildAndPushImage = async () => {
-  const template = Handlebars.compile( DOCKERFILE_TEMPLATE )
-  const renderedDockerfile = template( { PG_VERSION } )
-  debug( { renderedDockerfile }, '<==Dockerfile' )
-
-  // Write the Dockerfile to a temporary location
-  const dockerfilePath = path.resolve( 'Dockerfile.temp' )
-  fs.writeFileSync( dockerfilePath, renderedDockerfile )
-
-  // Build the image
-  log( chalk.yellow( '\nBuilding Docker image...' ) )
-  await shellCmd( `docker build --file ${dockerfilePath} --tag ${LEVEREGE_IMAGE_NAME_WITH_TAG} .`, { 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.unlinkSync( dockerfilePath )
-}
-
-// Main execution flow
-try {
-  if ( await checkExistingImage( LEVEREGE_IMAGE_NAME_WITH_TAG ) ) {
-    err(
-      `${chalk.red( '*** ERROR ***' )} The image already exists:\n` +
-      `  Image   : ${chalk.yellow( LEVEREGE_IMAGE_NAME_WITH_TAG )}\n` +
-      `  Registry: ${chalk.green( LEVEREGE_REGISTRY )}\n` +
-      `  Tag     : ${chalk.green( LEVEREGE_IMAGE_TAG )}\n`
-    )
-    process.exit( 1 )
-  }
-
-  log( `${chalk.cyan( '\nAbout to build a new Docker image:\n' )}
-    PostgreSQL   => ${chalk.green( PG_VERSION )}
-    Image Name   => ${chalk.green( LEVEREGE_IMAGE_NAME_WITH_TAG )}\n` )
-
-  log( `Enter "${chalk.green( 'yes' )}" to proceed or anything else to exit.` )
-  const confirmation = await new Promise( ( resolve ) => {
-    process.stdin.once( 'data', data => resolve( data.toString().trim() ) )
-  } )
-
-  if ( confirmation !== 'yes' ) {
-    log( chalk.red( 'Aborted by user.' ) )
-    process.exit( 1 )
-  }
-
-  await buildAndPushImage()
-  log(
-    chalk.green( '\nImage built and successfully pushed - tagged => ' ) +
-    chalk.yellow( `${LEVEREGE_IMAGE_TAG}` )
-  )
-  process.exit( 0 )
-} catch ( error ) {
-  err( chalk.red( 'An error occurred:' ), error.message )
-  process.exit( 1 )
-}

package/src/chart-compass.mjs

@@ -1,97 +0,0 @@
-#!/usr/bin/env node
-/* eslint-disable */
-/*
- * chart-to-registry will...
- */
-import fs from 'node:fs'
-
-import chalk from 'chalk'
-import commandLineArgs from 'command-line-args'
-import commandLineUsage from 'command-line-usage'
-import { lt as semverLt } from 'semver'
-import YAML from 'js-yaml'
-
-import {
-  condir,
-  debug,
-  errorExit,
-  log,
-  warning,
-  getGitRootDirectory,
-  parsePackageJson,
-  parseHelmChart,
-  shellCmd } from './Utils.mjs'
-
-const commandLineOptions = [ // Use commandLineOptions to tie into the Usage statements
-   
-  {
-    name : 'location',
-    type : String,
-    description : '{green the location of the artifact registry the chart will be pushed to (default us-docker.pkg.dev)}',
-  },
-  {
-    name : 'project',
-    type : String,
-    description : '{green the name of the google project containing the npmrc and slack config secrets (default leverege-registry)}',
-  },
-  {
-    name : 'repository',
-    type : String,
-    description : '{green the target repository to receive the pushed chart}',
-  },
-  {
-    name : 'dry-run',
-    type : Boolean,
-    description : '{yellow perform everything except the actual chart push}',
-  },
-  {
-    name : 'help',
-    type : Boolean,
-    description : '{green display this help screen}',
-  },
-   
-]
-
-const sections = [
-  {
-    header : 'Leverege Helm Chart Compass (for helmup)',
-    content : `{green This tool helps helmup navigate the helm charts stored in the
-artifact-registries.}`
-  },
-  { header : 'Options',
-    optionList : commandLineOptions,
-  },
-]
-
-const args = commandLineArgs( commandLineOptions, { camelCase : true, partial : true } )
-const usage = commandLineUsage( sections )
-
-if ( args.help ) {
-  log( usage )
-  process.exit( 0 )
-}
-
-/* eslint-disable no-underscore-dangle */
-if ( args._unknown ) {
-  log( usage )
-  log( `\nUnrecognized argument [${chalk.bold.red( args._unknown )}]\n` )
-  process.exit( 1 )
-}
-/* eslint-enable no-underscore-dangle */
-
-const minNodejsVersion = '18.0.0'
-if ( semverLt( process.version, minNodejsVersion ) ) {
-  errorExit( `\n***ERROR: must be running at least node ${minNodejsVersion}\n` )
-}
-
-// First of all, fail if we are not in a git repository
-let gitRoot
-try {
-  gitRoot = await getGitRootDirectory()
-} catch ( error ) {
-  errorExit( chalk.red.bold( error ), { errorCode : 5 } )
-}
-
-const chartCompass = YAML.load( fs.readFileSync( './registry-compass.yaml', 'utf8' ) )
-
-condir( { chartCompass }, '<==Navigation' )