@leverege/build-tools 2.67.3-beta.9 → 2.68.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leverege/build-tools",
-  "version": "2.67.3-beta.9",
+  "version": "2.68.0",
   "description": "A collection of build / support tools for Leverege developers",
   "main": "index.js",
   "repository": {
@@ -70,10 +70,10 @@
     "deepmerge": "^4.3.1",
     "enquirer": "^2.4.1",
     "execa": "^9.6.0",
-    "glob": "^11.0.2",
+    "glob": "^11.0.3",
     "handlebars": "^4.7.8",
     "ignore": "^7.0.5",
-    "inquirer": "^12.6.3",
+    "inquirer": "^12.7.0",
     "js-yaml": "^4.1.0",
     "jsdoc": "^4.0.4",
     "ms": "^2.1.3",
@@ -86,10 +86,10 @@
     "shell-quote": "^1.8.3",
     "simple-git": "^3.28.0",
     "toml": "^3.0.0",
-    "zx": "^8.5.5"
+    "zx": "^8.6.1"
   },
   "devDependencies": {
     "@leverege/eslint-config-leverege": "^5.0.1",
-    "npm": "^11.4.1"
+    "npm": "^11.4.2"
   }
-}
+}

package/src/Docker.mjs

@@ -40,16 +40,14 @@ const dockerfilePluginTemplate = `
 # 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' )
-const cloudBuildSteps = fs.readFileSync( path.join( DIRNAME, './templates/cloudBuildSteps.hbs' ), 'utf8' )
+const cloudBuildSteps = fs.readFileSync( path.join( DIRNAME, './templates/cloudBuildTargetGKE.hbs' ), 'utf8' )
 
 const defaultSettings = {
   apkadds : '',
@@ -78,7 +76,9 @@ const generateDockerfile = async ( options ) => {
 
   const gitReference = await shellCmd( 'git rev-parse --short HEAD' )
   const settings = { gitReference, ...defaultSettings, ...options }
-
+  const dockerTemplate = options.isNodeJsProject ? 'dockerfileTemplateNodeJs' : 'dockerfileTemplatePython'
+  const dockerfileTemplate = fs.readFileSync( path.join( DIRNAME, `./templates/${dockerTemplate}.hbs` ), 'utf8' ) // eslint-disable-line security/detect-non-literal-fs-filename
+  
   // defaults to the current "official" version of node unless it gets
   // overridden in the leverege.nodeimg package.json stanza
   if ( !settings.nodeimage ) {
@@ -173,10 +173,16 @@ const validateCloudBuildBucket = async ( artifactProject ) => {
   }
 }
 
-const buildContainerImage = async ( {
-  artifactProject, artifactRegistry, containerName, 
-  imageVersion, isNpmWorkspace, options
-} ) => {
+const buildContainerImage = async ( repoDescr ) => {
+  const {
+    artifactProject,
+    artifactRegistry,
+    containerName, 
+    imageVersion,
+    isNodeJsProject,
+    isNpmWorkspace,
+    // isPythonProject,
+  } = repoDescr
   const buildWorkspace = './build/workspace' // passed to Cloud Build
   const imageName = `${artifactRegistry}/images/${containerName}`
 
@@ -192,7 +198,7 @@ const buildContainerImage = async ( {
   // Steps taken here attempt to minimize impact on legacy build setups
   //   1. rename build dir to workspace
   //   2. create the actual build dir and move workspace into it
-  //   3. move the Dockerfile into build and make a copy for image root
+  //   3. copy the Dockerfile into build and make a copy for image root
   //   4. copy the bashrc file into build and .bashrc on the image root
   //   5. drop a copy of dev's npmrc to use for build process
   //   6. drop a copy of package.json and the lock into the image root
@@ -200,12 +206,14 @@ const buildContainerImage = async ( {
   fs.renameSync( './build', './workspace' )
   fs.mkdirSync( './build' )
   fs.renameSync( './workspace', buildWorkspace )
-  fs.renameSync( './docker/Dockerfile', './build/Dockerfile' )
+  fs.cpSync( './docker/Dockerfile', './build/Dockerfile' )
   fs.cpSync( './build/Dockerfile', `${buildWorkspace}/Dockerfile` )
   fs.renameSync( './docker/bashrc', './build/bashrc' )
-  fs.cpSync( `${process.env.HOME}/.npmrc`, './build/.npmrc' )
-  fs.cpSync( './package.json', `${buildWorkspace}/package.json` )
-  fs.cpSync( './package-lock.json', `${buildWorkspace}/package-lock.json` )
+  if ( isNodeJsProject ) {
+    fs.cpSync( `${process.env.HOME}/.npmrc`, './build/.npmrc' )
+    fs.cpSync( './package.json', `${buildWorkspace}/package.json` )
+    fs.cpSync( './package-lock.json', `${buildWorkspace}/package-lock.json` )
+  }
   if ( isNpmWorkspace ) {
     fs.rm( './package-lock.json', ( err ) => {} ) // no leaf node locks in workspaces
   }

package/src/DockerPy.mjs

@@ -1,3 +1,6 @@
+/**
+ * DEPRECATED - DO NOT MODIFY
+ */
 import fs from 'node:fs'
 import path from 'node:path'
 import url from 'node:url'
@@ -37,7 +40,7 @@ const pluginTemplate = `
 # 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' )
+const cloudBuildSteps = fs.readFileSync( path.join( DIRNAME, './templates/cloudBuildTargetGKE.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}`
@@ -79,7 +82,6 @@ const extractBaseImageTag = ( imageStr ) => {
 function generateDockerfile( options ) {
 
   const settings = { ...defaultSettings, ...options }
-
   settings.image = settings.imageBase
   // TODO: this is a janky way to pass the image tag back out
   defaultSettings.buildTag = extractBaseImageTag( settings.image )
@@ -161,8 +163,8 @@ async function validateCloudBuildBucket( artifactProject ) {
 }
 
 async function buildContainerImage( {
-  artifactProject, artifactRegistry, containerName,
-  imageVersion, imagePlatform, isNpmWorkspace, options
+  artifactProject, artifactRegistry, containerName, 
+  imageVersion, isNpmWorkspace, options
 } ) {
   const buildWorkspace = './build/workspace' // passed to Cloud Build
   const imageName = `${artifactRegistry}/images/${containerName}`
@@ -195,7 +197,7 @@ async function buildContainerImage( {
   // build the cloudbuild.yaml from the handlebars template
   const cloudBuildFile = './build/cloudbuild.yaml'
   const cbst = handlebars.compile( cloudBuildSteps, { noEscape : true } )
-  const cbs = cbst( { artifactProject, artifactRegistry, imageName, imageVersion, imageInfoTag, imagePlatform } )
+  const cbs = cbst( { artifactProject, artifactRegistry, imageName, imageVersion, imageInfoTag, } )
   fs.writeFileSync( cloudBuildFile, cbs )
 
   // build up the cloud build command and options

package/src/Utils.mjs

@@ -415,7 +415,26 @@ export const parsePyProjectToml = async ( packageFileName = './pyproject.toml' )
   if ( !fs.existsSync( packageFileName ) ) { return undefined } // eslint-disable-line security/detect-non-literal-fs-filename
   const tomlStr = fs.readFileSync( packageFileName ) // eslint-disable-line security/detect-non-literal-fs-filename
   const pyproject = toml.parse( tomlStr )
-  return pyproject
+
+  const registry = pyproject?.leverege?.registry
+  if ( !registry ) {
+    errorExit( 'Error: pyproject.toml is missing a proper [leverege] registry statement' )
+  }
+
+  const registryComponents = registry.split( '/' )
+  if ( registryComponents.length !== 3 ) {
+    errorExit( 'Error: pyproject.toml has a malformed [leverege] registry statement' )
+  }
+
+  const [ region, project, repository ] = registryComponents
+  const artifactRegistry = { region, project, repository }
+
+  if ( !fs.existsSync( '.python-version' ) ) {
+    errorExit( 'Error: missing the .python-version file - it is required' )
+  }
+  const pythonVersion = fs.readFileSync( '.python-version' )
+
+  return { artifactRegistry, pythonVersion, ...pyproject }
 }
 
 export const parseHelmChart = async ( helmroot = './helm' ) => {
@@ -451,30 +470,27 @@ export const parseHelmChart = async ( helmroot = './helm' ) => {
 }
 
 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/**' } )
   const helmChart = await parseHelmChart()
-  const isMonoRepo = subPkgs?.length > 0
   const rootPackageJson = await parseJsonFile( `${gitRoot}/package.json` )
   const rootPyProjectToml = await parsePyProjectToml( `${gitRoot}/pyproject.toml` )
-  const isNpmWorkspace = rootPackageJson?.workspaces?.length > 0
 
   return {
-    currentDir,
-    workingDir,
+    currentDir : process.cwd(),
+    workingDir : process.env.PWD,
     gitBranch,
     gitHooksPath,
     gitRoot,
     gitUpstream,
     helmChart,
-    isGitRepo,
-    isMonoRepo,
-    isNpmWorkspace,
+    isGitRepo : gitRoot !== undefined,
+    isMonoRepo : subPkgs?.length > 0,
+    isNodeJsProject : rootPackageJson !== undefined,
+    isNpmWorkspace : rootPackageJson?.workspaces?.length > 0,
+    isPythonProject : rootPyProjectToml !== undefined,
     rootPackageJson,
     rootPyProjectToml,
     subPkgs,
@@ -487,6 +503,8 @@ export const analyzeRepository = async ( giveGuidance ) => {
     subPkgs,
     helmChart,
     isMonoRepo,
+    isNodeJsProject,
+    isPythonProject,
     rootPackageJson,
     rootPyProjectToml,
     isNpmWorkspace,
@@ -532,11 +550,20 @@ export const analyzeRepository = async ( giveGuidance ) => {
     await shellCmd( 'npm run build' )
   }
 
-  const buildToolsVersion = closestPackageJson?.devDependencies['@leverege/build-tools'] || closestPackageJson?.dependencies['@leverege/build-tools']
+  let buildToolsVersion
+  if ( isNodeJsProject ) {
+    buildToolsVersion = closestPackageJson?.devDependencies['@leverege/build-tools']
+  }
 
+  // if the build tools version is still undefined then assume we are using a globally installed bt
+  if ( buildToolsVersion === undefined ) {
+    const fromBuildTools = await shellCmd( 'build-tools --version' )
+    buildToolsVersion = fromBuildTools.match( /\d+\.\d+\.\d+$/ )[0]
+  }
+ 
   const containerName = closestPackageJson?.name.replace( /^@[^/]+\//, '' ) || rootPyProjectToml?.project.name
-  const artifactProject = closestPackageJson?.artifactRegistry.project || 'unused'
-  const artifactRegistry = closestPackageJson?.leverege.registry || rootPyProjectToml?.registry
+  const artifactRegistry = closestPackageJson?.leverege.registry || rootPyProjectToml?.leverege.registry
+  const artifactProject = closestPackageJson?.artifactRegistry.project || rootPyProjectToml?.artifactRegistry.project || 'unknown'
   const packageVersion = `v${closestPackageJson?.version || rootPyProjectToml?.project.version}`
 
   const currentDir = process.cwd()
@@ -568,6 +595,8 @@ export const analyzeRepository = async ( giveGuidance ) => {
     helmChart,
     isMonoRepo,
     isNpmWorkspace,
+    isNodeJsProject,
+    isPythonProject,
     rootPackageJson,
     rootPyProjectToml,
     closestPackageJson,

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

@@ -1,13 +1,13 @@
 #!/usr/bin/env node
-/*
- * docker-to-registry-py will...
+/**
+ * DEPRECATED - DO NOT MODIFY
  */
 import fs from 'node:fs'
 import toml from 'toml'
 import chalk from 'chalk'
 
 import {
-  debug, log,
+  debug, log, warning,
   errorExit,
   getGitBranchAndUpstream,
   gitRepoIsDirty,
@@ -23,6 +23,8 @@ import Docker from './DockerPy.mjs'
 //   log( refreshErr ) // most likely the token refreshed message
 // }
 
+warning( 'docker-to-registry-py has been DEPRECATED - use docker-to-registry' )
+
 const options = {}
 let imageVersion = null
 // Expected to be invoked like docker-to-registry-py v1.2.3
@@ -91,9 +93,8 @@ const repoDescr = {
   containerName : pyproject.project.name,
   packageVersion : `v${pyproject.project.version}`,
   artifactRegistry : pyproject.leverege.registry || 'us-docker.pkg.dev/leverege-registry/stack',
-  // registryFolder : `${pyproject.leverege['registry-folder']}/images/${pyproject.project.name}`, Not being used
+  registryFolder : `${pyproject.leverege['registry-folder']}/images/${pyproject.project.name}`,
   imageBase : pyproject.leverege['image-base'],
-  imagePlatform : pyproject.leverege['image-platform'] || 'linux/amd64',
   helmChart : await parseHelmChart(),
 }
 
@@ -215,7 +216,6 @@ log( `
   ${chalk.green.bold( 'Build Information:' )}
     Container:     ${chalk.green.bold( containerName )}
     Version:       ${chalk.green.bold( imageVersion )}   ${tagInfo}
-    Platform:      ${chalk.green.bold( repoDescr.imagePlatform )}
     Registry:      ${chalk.green.bold( artifactRegistry )}
     Image Folder:  ${chalk.yellow.bold( registryFolder )}
 

package/src/docker-to-registry.mjs

@@ -18,7 +18,7 @@ import {
 
 import docker from './Docker.mjs'
 
-const minimumBuildToolsVersion = '2.48.1'
+const minimumBuildToolsVersion = '2.68.0'
 
 // refresh-npm-token does not throw so no need to try, but it emits in debug
 const refreshErr = await shellCmd( 'refresh-npm-token' )
@@ -94,14 +94,6 @@ if ( semver.lt( semver.coerce( repoDescr.buildToolsVersion ), minimumBuildToolsV
   errorExit( `Error: package.json @leverege/build-tools minimum version is ^${minimumBuildToolsVersion}` )
 }
 
-const dockerInfo = await docker.generateDockerfile( {
-  regvers : repoDescr.packageVersion,
-  imageBase : repoDescr.closestPackageJson.leverege?.imageBase,
-  buildEnv : repoDescr.closestPackageJson.leverege?.buildEnv || 'alpine',
-  nodeimage : repoDescr.closestPackageJson.leverege?.nodeimg, // left as nodeimg in package.json for backwards compat
-} )
-debug( { dockerInfo }, '<==The Docker Info' )
-
 const {
   artifactProject,
   artifactRegistry,
@@ -109,17 +101,35 @@ const {
   containerName,
   helmChart,
   isNpmWorkspace,
+  isNodeJsProject,
+  isPythonProject,
 } = repoDescr
 
+const leveregeStanza = isNodeJsProject ? repoDescr.closestPackageJson.leverege : repoDescr.rootPyProjectToml.leverege
+
+const dockerInfo = await docker.generateDockerfile( {
+  isNodeJsProject,
+  isPythonProject,
+  buildEnv : leveregeStanza.buildEnv || leveregeStanza.buildenv || 'alpine',
+  imageBase : leveregeStanza.imageBase,
+  runuser : leveregeStanza.runUser || leveregeStanza.runuser || isNodeJsProject ? 'node' : 'python',
+  nodeimage : leveregeStanza.nodeimg, // left as nodeimg in package.json for backwards compat
+  regvers : repoDescr.packageVersion,
+  pythonVersion : repoDescr.rootPyProjectToml?.pythonVersion,
+} )
+debug( { dockerInfo }, '<==The Docker Info' )
+
 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 ( isNodeJsProject ) {
+  // 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
@@ -214,10 +224,10 @@ log( `
     Version:       ${chalk.green.bold( imageVersion )}   ${tagInfo}
     Registry:      ${chalk.green.bold( artifactRegistry )}
     Image Folder:  ${chalk.yellow.bold( registryFolder )}
-    Monorepo:      ${chalk.green.bold( repoDescr.isMonoRepo )}
-    NPM Workspace: ${chalk.green.bold( isNpmWorkspace )}
-
-  ${chalk.green.bold( 'Docker Information:' )}
+  ` )
+if ( isNodeJsProject ) {
+  log( `
+  ${chalk.green.bold( 'NodeJS 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 )}
@@ -226,7 +236,19 @@ log( `
     DateStamp:     ${chalk.green.bold( dockerInfo.date )}
     NPM Logs:      ${chalk.green.bold( dockerInfo.npmlogging )}
     NPM Version:   ${chalk.green.bold( dockerInfo.npmVersion )}
-` )
+  ` )
+}
+
+if ( isPythonProject ) {
+  log( `
+  ${chalk.green.bold( 'Python Docker Information:' )}
+    BaseImage:     ${chalk.green.bold( dockerInfo.imageBase || `node:${dockerInfo.nodeimage}` )}
+    Python Ver:    ${chalk.green.bold( dockerInfo.pythonVersion )}
+    Run User:      ${chalk.green.bold( dockerInfo.runuser )}
+    Previous:      ${chalk.yellow.bold( dockerInfo.previousBuild )}
+    DateStamp:     ${chalk.green.bold( dockerInfo.date )}
+  ` )
+}
 
 if ( imageVersion !== packageVersion ) {
   log( `
@@ -281,7 +303,7 @@ if ( isNpmWorkspace ) {
   await shellCmd( 'npm install --package-lock-only --workspaces false', { stdio : 'inherit' } )
 }
 
-await docker.buildContainerImage( { ...repoDescr, options, imageVersion } )
+await docker.buildContainerImage( { ...repoDescr, imageVersion } )
 
 if ( willGitTag ) {
   const tagDescription = `docker_${imageVersion}`

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

@@ -12,7 +12,7 @@ spec:
     enablePodMonitor: false # set true once monitoring is setup
 
   # https://console.cloud.google.com/artifacts/docker/leverege-registry/us/system/images%2Fleverege-pgsql?project=leverege-registry
-  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:17.5-cnpg-lvrg-rel.1
   description: "Leverege Stack PostgreSQL DB"
   bootstrap:
     initdb:

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

@@ -11,7 +11,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:17.5-cnpg-lvrg-rel.1
   bootstrap:
     initdb:
 #     database: imagine # let it default to cnpg app db

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

@@ -11,7 +11,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:17.5-cnpg-lvrg-rel.1
   bootstrap:
     initdb:
       postInitTemplateSQL:

package/src/helm-charts/scheduler/values-local.yaml

@@ -6,3 +6,6 @@ config:
 
   # CNPG override
   SQL_HOST: "cnpg-db-psql-stack-rw.cnpg-operands" # vs postgres-postgresql
+
+serviceMonitor:
+  enabled: true

package/src/helm-charts/transponder-bq/values-local.yaml

@@ -1,7 +1,7 @@
 nameOverride: transponder-bq
 
 image:
-  tag: # v5.5.1
+  tag: # v5.6.0
 
 config:
   TRANSPONDER_RUN_MODE: "bigQueryJson"

package/src/helm-charts/transponder-dh/values-local.yaml

@@ -1,7 +1,7 @@
 nameOverride: transponder-dh
 
 image:
-  tag: # v5.5.1
+  tag: # v5.6.0
 
 config:
   TRANSPONDER_RUN_MODE: "denseHistoryCombined"

package/src/helm-charts/transponder-rt/values-local.yaml

@@ -1,7 +1,7 @@
 nameOverride: transponder-rt
 
 image:
-  tag: # v5.5.1
+  tag: # v5.6.0
 
 config:
   TRANSPONDER_RUN_MODE: "rt"

package/src/helm-charts/transponder-tsdb/values-local.yaml

@@ -7,7 +7,7 @@
 nameOverride: transponder-tsdb
 
 image:
-  tag: # v5.5.1
+  tag: # v5.6.0
 
 config:
   TRANSPONDER_RUN_MODE: "timescale"

package/src/k8x.sh

@@ -43,6 +43,10 @@ K8X_HELP
     ns="elastic" && cmd="bash"
     ;;
 
+  "grafana")
+    FZFQ="--query=grafana" && ns="prometheus" && cmd="bash"
+    ;;
+
   "prom-operator"|"prometheus")
     ns="prometheus" && cmd="bash"
     ;;

package/src/templates/{cloudBuildSteps.hbs → cloudBuildTargetGKE.hbs}

@@ -4,10 +4,7 @@ options:
 steps:
   - name: 'gcr.io/cloud-builders/docker'
     entrypoint: 'bash'
-    args: ['-c', 'docker pull --platform={{imagePlatform}} {{imageName}}:latest || exit 0']
-
-  - name: 'gcr.io/cloud-builders/docker'
-    args: ['buildx', 'create', '--driver', 'docker-container', '--name', 'container', '--driver-opt', 'network=cloudbuild', '--use']
+    args: ['-c', 'docker pull {{imageName}}:latest || exit 0']
 
   - name: 'gcr.io/cloud-builders/docker'
     args:

package/src/templates/{dockerfileTemplate.hbs → dockerfileTemplateNodeJs.hbs}

@@ -1,3 +1,4 @@
+# Template dockerfileTemplateNodeJs
 # Version {{regvers}} @ {{date}} / Git Ref: {{gitReference}}
 
 # The FROM directive sets the Base Image for subsequent instructions

package/src/templates/dockerfileTemplatePy.hbs

@@ -1,3 +1,8 @@
+# *** DEPRECATED *** DEPRECATED *** DEPRECATED ***
+# *** DEPRECATED *** DEPRECATED *** DEPRECATED ***
+# *** DEPRECATED *** DEPRECATED *** DEPRECATED ***
+
+# Template dockerfileTemplatePython
 # Version {{regvers}} @ {{date}}
 
 FROM {{image}}

package/src/templates/dockerfileTemplatePython.hbs

@@ -0,0 +1,65 @@
+# Template dockerfileTemplatePython
+# Version {{regvers}} @ {{date}}
+
+FROM {{image}}
+
+ARG BUILD_ENV="{{buildEnv}}"
+
+RUN useradd -ms /bin/bash {{runuser}} && \
+    mkdir -p /usr/src/app /home/{{runuser}} && \
+    chown -R {{runuser}} /usr/src/app /home/{{runuser}} && \
+    apt-get update && apt-get install -y \
+      wget git libgl1 libglib2.0-0 && \
+    rm -rf /var/lib/apt/lists/*
+
+# Copy uv binary from distroless image
+COPY --from=ghcr.io/astral-sh/uv:latest /uv /bin/uv
+
+# Copy bashrc early
+COPY --chown={{runuser}}:{{runuser}} ./bashrc /home/{{runuser}}/.bashrc
+
+WORKDIR /usr/src/app
+USER {{runuser}}
+
+ENV GRPC_VERBOSITY=ERROR
+ENV VIRTUAL_ENV=/usr/src/app/.venv
+ENV PATH="$VIRTUAL_ENV/bin:$PATH:/home/{{runuser}}/.local/bin"
+
+# Setup pip.conf for GCP Artifact Registry in case pip is needed for building
+RUN mkdir -p /home/{{runuser}}/.config/pip && \
+    echo "[global]" >> /home/{{runuser}}/.config/pip/pip.conf && \
+    echo "break-system-packages = true" >> /home/{{runuser}}/.config/pip/pip.conf
+
+# Set up venv and keyring tools before app copy
+RUN uv venv && \
+    uv tool install keyring --with keyrings.google-artifactregistry-auth
+
+# Pre-plugin block: models or pre-install commands
+{{preInstallPluginfile}}
+
+# Copy only dependency definitions first
+COPY --chown=python:python ./workspace/pyproject.toml \
+    ./workspace/uv.lock \
+    ./workspace/.python-version \
+    ./workspace/README.md \
+    ./workspace/LICENSE.md \
+    /usr/src/app/
+
+# Sync dependencies
+RUN uv sync --keyring-provider subprocess \
+    --extra-index-url https://oauth2accesstoken@us-python.pkg.dev/leverege-registry/leverege-python-packages/simple \
+    && rm -rf /home/{{runuser}}/.cache
+
+# Copy application source AFTER venv + tool setup
+COPY --chown={{runuser}}:{{runuser}} ./workspace/ /usr/src/app/
+
+# Plugin block for additional pip packages
+{{pluginfile}}
+
+# Ensure src/ layout is importable from anywhere in the container
+ENV PYTHONPATH="/usr/src/app/src"
+
+# Show final venv state (optional)
+RUN ls /usr/src/app/.venv/bin
+
+CMD [ "/bin/bash", "-c", "source /home/{{runuser}}/.bashrc && python scripts/server.py" ]

package/.vscode/settings.json

@@ -1,3 +0,0 @@
-{
-    "editor.formatOnSave": false
-}

package/src/build-and-push.sh

@@ -1,78 +0,0 @@
-#!/bin/bash
-
-application_name=$(awk -F'"' '/\[(tool\.poetry|project)\]/{flag=1;next} flag==1 && /^name = /{ print $2; exit }' ./pyproject.toml)
-application_version=$(awk -F'"' '/\[(tool\.poetry|project)\]/{flag=1;next} flag==1 && /^version = /{ print $2; exit }' ./pyproject.toml)
-gcp_project_id=$(awk -F'"' '/\[tool\.docker\]/{flag=1;next} flag==1 && /^gcp-project-id = /{ print $2; exit }' ./pyproject.toml)
-gcp_repository_name=$(awk -F'"' '/\[tool\.docker\]/{flag=1;next} flag==1 && /^gcp-repository-name = /{ print $2; exit }' ./pyproject.toml)
-platform=$(awk -F'[][]' '/\[tool\.docker\]/{flag=1;next} flag==1 && /^platform *=/ { gsub(/"/, "", $2); gsub(/, /, ",", $2); print $2; exit }' ./pyproject.toml)
-# Check if the platform is empty
-if [ -z "$platform" ]; then
-  platform="linux/amd64,linux/arm64"
-fi
-
-# Check if the version contains alpha, beta, rc, or a hyphen
-if [[ $application_version =~ (alpha|beta|rc|-) ]]; then
-  is_stable_release="false"
-else
-  is_stable_release="true"
-fi
-
-cache_path="$HOME/docker/$application_name"
-
-echo -e "\n\033[0;32mBuild Information:\033[0m\n"
-
-# List application name, application version, GCP project ID, GCP repository name, platform, and if it is a stable release.
-echo -e "\033[0;32mApplication Name:\033[0m $application_name"
-echo -e "\033[0;32mApplication Version:\033[0m $application_version"
-echo -e "\033[0;32mGCP Project ID:\033[0m $gcp_project_id"
-echo -e "\033[0;32mGCP Repository Name:\033[0m $gcp_repository_name"
-echo -e "\033[0;32mPlatform:\033[0m $platform"
-echo -e "\033[0;32mStable Release:\033[0m $is_stable_release"
-
-# Prompt for confirmation
-echo -e "\n"
-read -p "Do you wish to proceed? (y/n): " -n 1 -r
-echo -e "\n"
-
-if [[ ! $REPLY =~ ^[Yy]$ ]]; then
-  echo -e "\033[0;31mExiting...\033[0m\n\n"
-  exit 1
-fi
-
-
-echo -e "\n\033[0;32mBuilding, creating and pushing image(s)...\033[0m\n\n"
-
-export GCLOUD_ACCESS_TOKEN=$(gcloud auth print-access-token)
-
-if [ "$is_stable_release" = "true" ]; then
-  docker buildx build \
-    --platform $platform   \
-    --build-arg APPLICATION_NAME=$application_name \
-    --build-arg APPLICATION_VERSION=$application_version \
-    --secret id=token,env=GCLOUD_ACCESS_TOKEN \
-    --secret="id=creds,src=$HOME/.config/gcloud/application_default_credentials.json" \
-    --tag us-docker.pkg.dev/$gcp_project_id/$gcp_repository_name/${application_name}:${application_version} \
-    --tag us-docker.pkg.dev/$gcp_project_id/$gcp_repository_name/${application_name}:latest \
-    --push \
-    .
-else
-  docker buildx build \
-    --platform $platform \
-    --build-arg APPLICATION_NAME=$application_name \
-    --build-arg APPLICATION_VERSION=$application_version \
-    --secret id=token,env=GCLOUD_ACCESS_TOKEN \
-    --secret="id=creds,src=$HOME/.config/gcloud/application_default_credentials.json" \
-    --tag us-docker.pkg.dev/$gcp_project_id/$gcp_repository_name/${application_name}:${application_version} \
-    --push \
-    .
-fi
-
-if [ $? -eq 0 ]; then
-    echo -e "\n\n\033[0;32mBuilt and pushed us-docker.pkg.dev/$gcp_project_id/$gcp_repository_name/$application_name:$application_version for $platform\033[0m"
-    if [ "$is_stable_release" = "true" ]; then
-        echo -e "\033[0;32mAlso tagged as 'latest'\033[0m"
-    fi
-    echo -e "\n\n"
-else
-    echo -e "\n\n\033[0;31mBuild and push failed!\033[0m\n\n"
-fi