@leverege/build-tools 2.68.2 → 2.68.3-beta.2

package/package.json

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

package/src/Docker.mjs

@@ -47,7 +47,8 @@ const bashrcPluginTemplate = `
 #
 `
 const bashrcTemplate = fs.readFileSync( path.join( DIRNAME, './templates/bashrcTemplate.hbs' ), 'utf8' )
-const cloudBuildSteps = fs.readFileSync( path.join( DIRNAME, './templates/cloudBuildTargetGKE.hbs' ), 'utf8' )
+const cloudBuildStepsSingleArch = fs.readFileSync( path.join( DIRNAME, './templates/cloudBuildSingleArch.hbs' ), 'utf8' )
+const cloudBuildStepsMultiArch = fs.readFileSync( path.join( DIRNAME, './templates/cloudBuildMultiArch.hbs' ), 'utf8' )
 
 const defaultSettings = {
   apkadds : '',
@@ -178,6 +179,7 @@ const buildContainerImage = async ( repoDescr ) => {
     artifactProject,
     artifactRegistry,
     containerName, 
+    imagePlatform,
     imageVersion,
     isNodeJsProject,
     isNpmWorkspace,
@@ -226,8 +228,18 @@ const buildContainerImage = async ( repoDescr ) => {
   
   // build the cloudbuild.yaml from the handlebars template
   const cloudBuildFile = './build/cloudbuild.yaml'
+  let cloudBuildSteps
+  let imagePlatformString
+  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, imageVersion, imageInfoTag, } )
+  const cbs = cbst( { artifactProject, artifactRegistry, imageName, imagePlatform : imagePlatformString, imageVersion, imageInfoTag, } )
   fs.writeFileSync( cloudBuildFile, cbs )
 
   // build up the cloud build command and options

package/src/Utils.mjs

@@ -565,10 +565,11 @@ export const analyzeRepository = async ( giveGuidance ) => {
   // 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]
+    buildToolsVersion = fromBuildTools.match( /\d+\.\d+\.\d+(?:-[a-zA-Z0-9.-]+)?$/ )[0]
   }
  
   const containerName = closestPackageJson?.name.replace( /^@[^/]+\//, '' ) || rootPyProjectToml?.project.name
+  const imagePlatform = closestPackageJson?.leverege.imagePlatform || rootPyProjectToml?.leverege['image-platform']
   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}`
@@ -595,6 +596,7 @@ export const analyzeRepository = async ( giveGuidance ) => {
     artifactRegistry,
     buildToolsVersion,
     containerName,
+    imagePlatform,
     currentDir,
     closestPkg,
     gitRoot,

package/src/docker-to-registry.mjs

@@ -229,6 +229,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 +244,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 )}

package/src/templates/cloudBuildMultiArch.hbs

@@ -0,0 +1,27 @@
+options:
+  machineType: E2_HIGHCPU_8
+
+steps:
+  - name: 'gcr.io/cloud-builders/docker'
+    args: ['buildx', 'create', '--driver', 'docker-container', '--name', 'container', '--driver-opt', 'network=cloudbuild', '--buildkitd-flags', '--allow-insecure-entitlement=network.host', '--use']
+
+  - name: 'gcr.io/cloud-builders/docker'
+    args:
+      - 'buildx'
+      - 'build'
+      - '--builder=container'
+      - '--network=host'
+      - '--platform'
+      - '{{imagePlatform}}'
+      - '--cache-from'
+      - 'type=registry,ref={{imageName}}:cache,mode=max'
+      - '--cache-to'
+      - 'type=registry,ref={{imageName}}:cache,mode=max'
+      - '--tag'
+      - '{{imageName}}:{{imageInfoTag}}'
+      - '--tag'
+      - '{{imageName}}:{{imageVersion}}'
+      - '--tag'
+      - '{{imageName}}:latest'
+      - '--push'
+      - '.'