@leverege/build-tools 2.67.3-beta.4 → 2.67.3-beta.6

package/package.json

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

package/src/Docker.mjs

@@ -175,7 +175,7 @@ const validateCloudBuildBucket = async ( artifactProject ) => {
 
 const buildContainerImage = async ( {
   artifactProject, artifactRegistry, containerName, 
-  imageVersion, imagePlatform, isNpmWorkspace, options
+  imageVersion, isNpmWorkspace, options
 } ) => {
   const buildWorkspace = './build/workspace' // passed to Cloud Build
   const imageName = `${artifactRegistry}/images/${containerName}`
@@ -219,7 +219,7 @@ const buildContainerImage = async ( {
   // 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/DockerPy.mjs

@@ -161,8 +161,8 @@ async function validateCloudBuildBucket( artifactProject ) {
 }
 
 async function buildContainerImage( {
-  artifactProject, artifactRegistry, containerName, 
-  imageVersion, isNpmWorkspace, options
+  artifactProject, artifactRegistry, containerName,
+  imageVersion, imagePlatform, isNpmWorkspace, options
 } ) {
   const buildWorkspace = './build/workspace' // passed to Cloud Build
   const imageName = `${artifactRegistry}/images/${containerName}`
@@ -195,7 +195,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, } )
+  const cbs = cbst( { artifactProject, artifactRegistry, imageName, imageVersion, imageInfoTag, imagePlatform } )
   fs.writeFileSync( cloudBuildFile, cbs )
 
   // build up the cloud build command and options

package/src/docker-to-registry.mjs

@@ -97,7 +97,6 @@ if ( semver.lt( semver.coerce( repoDescr.buildToolsVersion ), minimumBuildToolsV
 const dockerInfo = await docker.generateDockerfile( {
   regvers : repoDescr.packageVersion,
   imageBase : repoDescr.closestPackageJson.leverege?.imageBase,
-  imagePlatform : repoDescr.closestPackageJson.leverege?.imagePlatform || 'linux/amd64',
   buildEnv : repoDescr.closestPackageJson.leverege?.buildEnv || 'alpine',
   nodeimage : repoDescr.closestPackageJson.leverege?.nodeimg, // left as nodeimg in package.json for backwards compat
 } )
@@ -213,7 +212,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 )}
     Monorepo:      ${chalk.green.bold( repoDescr.isMonoRepo )}

package/src/templates/cloudBuildSteps.hbs

@@ -8,7 +8,8 @@ steps:
 
   - name: 'gcr.io/cloud-builders/docker'
     args:
-      - 'build' 
+      - 'buildx'
+      - 'build'
       - '--platform={{imagePlatform}}'
       - '--network=cloudbuild'
       - '-t'