@leverege/build-tools 2.85.0-beta.2 → 2.85.0-beta.4

package/package.json

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

package/src/Docker.mjs

@@ -155,8 +155,7 @@ const generateDockerfile = async ( options ) => {
     errorExit( `***ERROR: failed to write ${dockerfile}\n${err}` )
   }
 
-  const previousBuild = getPreviousBuild()
-  const dockerInfo = { dockerfile, previousBuild, ...settings }
+  const dockerInfo = { dockerfile, ...settings }
   delete dockerInfo.pluginfile
   return dockerInfo
 }
@@ -239,7 +238,7 @@ const buildContainerImage = async ( repoDescr ) => {
     cloudBuildSteps = cloudBuildStepsSingleArch
     imagePlatformString = 'linux/amd64'
   }
-  log( `imagePlatformString => ${imagePlatformString}` )
+
   const cbst = handlebars.compile( cloudBuildSteps, { noEscape : true } )
   const cbs = cbst( { artifactProject, artifactRegistry, imageName, imagePlatform : imagePlatformString, imageVersion, imageInfoTag, } )
   fs.writeFileSync( cloudBuildFile, cbs )

package/src/Utils.mjs

@@ -580,6 +580,7 @@ export const analyzeRepository = async ( giveGuidance ) => {
   const artifactProject = closestPackageJson?.artifactRegistry.project || rootPyProjectToml?.artifactRegistry.project || 'unknown'
   const packageVersion = `v${closestPackageJson?.version || rootPyProjectToml?.project.version}`
   const generateDockerfile = closestPackageJson?.leverege.generateDockerfile || rootPyProjectToml?.leverege['generate-dockerfile'] || true
+  log( `generateDockerfile => ${generateDockerfile} type: ${typeof generateDockerfile}` )
   const currentDir = process.cwd()
   const closestPkg = await packageUp()
 

package/src/docker-to-registry.mjs

@@ -122,6 +122,7 @@ const dockerfileOptions = {
   nodeimage : leveregeStanza.nodeimg, // left as nodeimg in package.json for backwards compat
   regvers : repoDescr.packageVersion,
   pythonVersion : repoDescr.rootPyProjectToml?.pythonVersion,
+  previousBuild : docker.getPreviousBuild(),
 }
 let dockerInfo
 if ( generateDockerfile ) {
@@ -243,7 +244,6 @@ if ( isNodeJsProject ) {
   log( `
   ${chalk.green.bold( 'NodeJS Docker Information:' )}
     NodeImage:     ${chalk.green.bold( dockerInfo.imageBase || `node:${dockerInfo.nodeimage}` )}
-    Platform:      ${chalk.green.bold( dockerInfo.imagePlatform )}
     Docker Env:    ${chalk.green.bold( dockerInfo.buildEnv || 'alpine' )}
     AddedPkgs:     ${chalk.green.bold( dockerInfo.apkadds )}
     Run User:      ${chalk.green.bold( dockerInfo.runuser )}
@@ -258,9 +258,9 @@ if ( isPythonProject ) {
   log( `
   ${chalk.green.bold( 'Python Docker Information:' )}
     BaseImage:     ${chalk.green.bold( dockerInfo.imageBase || `node:${dockerInfo.nodeimage}` )}
-    Platform:      ${chalk.green.bold( dockerInfo.imagePlatform )}
     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 )}
   ` )
 }