@leverege/build-tools 2.85.0-beta.1 → 2.85.0-beta.3

package/package.json

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

package/src/Docker.mjs

@@ -239,7 +239,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/docker-to-registry.mjs

@@ -113,19 +113,22 @@ const {
 
 const leveregeStanza = isNodeJsProject ? repoDescr.closestPackageJson.leverege : repoDescr.rootPyProjectToml.leverege
 
+const dockerfileOptions = {
+  isNodeJsProject,
+  isPythonProject,
+  buildEnv : leveregeStanza.buildEnv || leveregeStanza['build-env'] || 'alpine',
+  imageBase : leveregeStanza.imageBase || leveregeStanza['image-base'],
+  runuser : leveregeStanza.runUser || leveregeStanza['run-user'] || isNodeJsProject ? 'node' : 'python',
+  nodeimage : leveregeStanza.nodeimg, // left as nodeimg in package.json for backwards compat
+  regvers : repoDescr.packageVersion,
+  pythonVersion : repoDescr.rootPyProjectToml?.pythonVersion,
+}
+let dockerInfo
 if ( generateDockerfile ) {
-  const dockerInfo = await docker.generateDockerfile( {
-    isNodeJsProject,
-    isPythonProject,
-    buildEnv : leveregeStanza.buildEnv || leveregeStanza['build-env'] || 'alpine',
-    imageBase : leveregeStanza.imageBase || leveregeStanza['image-base'],
-    runuser : leveregeStanza.runUser || leveregeStanza['run-user'] || isNodeJsProject ? 'node' : 'python',
-    nodeimage : leveregeStanza.nodeimg, // left as nodeimg in package.json for backwards compat
-    regvers : repoDescr.packageVersion,
-    pythonVersion : repoDescr.rootPyProjectToml?.pythonVersion,
-  } )
+  dockerInfo = await docker.generateDockerfile( dockerfileOptions )
   debug( { dockerInfo }, '<==The Docker Info' )
 } else if ( !fs.existsSync( './docker/Dockerfile' ) ) {
+  dockerInfo = { ...dockerfileOptions }
   errorExit( '***ERROR: docker/Dockerfile does not exist and dockerfile generation is disabled' )
 }
 
@@ -240,7 +243,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 )}
@@ -255,10 +257,8 @@ 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 )}
   ` )
 }