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

package/package.json

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

package/src/Docker.mjs

@@ -230,13 +230,14 @@ const buildContainerImage = async ( repoDescr ) => {
   const cloudBuildFile = './build/cloudbuild.yaml'
   let cloudBuildSteps
   let imagePlatformString
-  if ( !imagePlatform || imagePlatform[0] === 'linux/amd64' ) {
+  if ( !imagePlatform || ( imagePlatform.length === 1 && imagePlatform[0] === 'linux/amd64' ) ) {
     cloudBuildSteps = cloudBuildStepsSingleArch
     imagePlatformString = 'linux/amd64'
   } else {
     cloudBuildSteps = cloudBuildStepsMultiArch
     imagePlatformString = imagePlatform.join( ',' )
   }
+  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

@@ -569,7 +569,7 @@ export const analyzeRepository = async ( giveGuidance ) => {
   }
  
   const containerName = closestPackageJson?.name.replace( /^@[^/]+\//, '' ) || rootPyProjectToml?.project.name
-  const imagePlatform = closestPackageJson?.leverege.imagePlatform || rootPyProjectToml?.leverege['image-platform']
+  const imagePlatform = closestPackageJson?.leverege.imagePlatform || rootPyProjectToml?.leverege['image-platform'] || 'linux/amd64'
   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}`

package/src/docker-to-registry.mjs

@@ -99,6 +99,7 @@ const {
   artifactRegistry,
   packageVersion,
   containerName,
+  imagePlatform,
   helmChart,
   isNpmWorkspace,
   isNodeJsProject,
@@ -221,6 +222,7 @@ if ( options?.helmChecks !== 'false' ) {
 log( `
   ${chalk.green.bold( 'Build Information:' )}
     Container:     ${chalk.green.bold( containerName )}
+    Platform:      ${chalk.green.bold( imagePlatform )}
     Version:       ${chalk.green.bold( imageVersion )}   ${tagInfo}
     Registry:      ${chalk.green.bold( artifactRegistry )}
     Image Folder:  ${chalk.yellow.bold( registryFolder )}
@@ -229,6 +231,7 @@ 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 )}
@@ -243,6 +246,7 @@ 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 )}