@leverege/build-tools 2.59.1 → 2.59.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leverege/build-tools",
-  "version": "2.59.1",
+  "version": "2.59.2",
   "description": "A collection of build / support tools for Leverege developers",
   "main": "index.js",
   "repository": {

package/src/circleate.sh

@@ -120,6 +120,7 @@ jobs:
           path: reports
 
   docs:
+    circleci_ip_ranges: true
     docker:
       - image: $CIRCLE_NODE_IMG
     steps:
@@ -339,6 +340,7 @@ jobs:
           path: reports
 
   docs:
+    circleci_ip_ranges: true
     docker:
       - image: $CIRCLE_NODE_IMG
     steps:

package/src/build-cnpg-image.mjs

@@ -1,167 +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 full registry image tag that is used for tagging the docker image in the artifact registry}`,
-  },
-]
-const args = cliArgs( optionList, { partial : true } )
-const help = cliHelp( sections )
-
-debug( { args, help }, '<==Command Line Info?' )
-
-// Show help if needed
-if ( args.help ) {
-  console.log( help )
-  process.exit( 0 )
-}
-
-// Define defaults
-const PG_VERSION = args.pgVersion || '16.4'
-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
-  console.log( chalk.yellow( 'Building Docker image...' ) )
-  await shellCmd( `docker build --file ${dockerfilePath} --tag ${LEVEREGE_IMAGE_NAME_WITH_TAG} .` )
-
-  // Push the image
-  console.log( chalk.green( 'Pushing Docker image...' ) )
-  await shellCmd( `docker push ${LEVEREGE_IMAGE_NAME_WITH_TAG}` )
-
-  // Clean up the temporary Dockerfile
-  fs.unlinkSync( dockerfilePath )
-}
-
-// Main execution flow
-try {
-  if ( await checkExistingImage( LEVEREGE_IMAGE_NAME_WITH_TAG ) ) {
-    console.error(
-      `${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 )
-  }
-
-  console.log( `${chalk.cyan( 'About to build a new Docker image:\n' ) 
-    }  PostgreSQL   => ${chalk.green( PG_VERSION )}\n` +
-    `  Image Name   => ${chalk.green( LEVEREGE_IMAGE_NAME_WITH_TAG )}\n` )
-
-  console.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' ) {
-    console.log( chalk.red( 'Aborted by user.' ) )
-    process.exit( 1 )
-  }
-
-  await buildAndPushImage()
-  console.log( chalk.green( 'Docker image build and push completed successfully!' ) )
-  process.exit( 0 )
-} catch ( error ) {
-  console.error( chalk.red( 'An error occurred:' ), error.message )
-  process.exit( 1 )
-}