@leverege/build-tools 2.67.3-beta.13 → 2.67.3-beta.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leverege/build-tools",
-  "version": "2.67.3-beta.13",
+  "version": "2.67.3-beta.2",
   "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, isNpmWorkspace, options
+  imageVersion, imagePlatform, 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, } )
+  const cbs = cbst( { artifactProject, artifactRegistry, imageName, imageVersion, imageInfoTag, imagePlatform } )
   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, imagePlatform, isNpmWorkspace, options
+  artifactProject, artifactRegistry, containerName, 
+  imageVersion, 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, imagePlatform } )
+  const cbs = cbst( { artifactProject, artifactRegistry, imageName, imageVersion, imageInfoTag, } )
   fs.writeFileSync( cloudBuildFile, cbs )
 
   // build up the cloud build command and options

package/src/docker-to-registry-py.mjs

@@ -91,9 +91,9 @@ const repoDescr = {
   containerName : pyproject.project.name,
   packageVersion : `v${pyproject.project.version}`,
   artifactRegistry : pyproject.leverege.registry || 'us-docker.pkg.dev/leverege-registry/stack',
-  // registryFolder : `${pyproject.leverege['registry-folder']}/images/${pyproject.project.name}`, Not being used
+  registryFolder : `${pyproject.leverege['registry-folder']}/images/${pyproject.project.name}`,
   imageBase : pyproject.leverege['image-base'],
-  imagePlatform : pyproject.leverege['image-platform'] || 'linux/amd64',
+  imagePlatform : pyproject.leverege['image-platform'],
   helmChart : await parseHelmChart(),
 }
 
@@ -215,7 +215,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 )}
 
@@ -273,7 +272,7 @@ if ( willGitTag ) {
 await proceed()
 
 log( chalk.green.bold( 'Building the Docker Image...' ) )
-await Docker.buildContainerImage( { ...repoDescr, imagePlatformList : [ repoDescr.imagePlatform.split( '/' )[0] ], options, imageVersion } )
+await Docker.buildContainerImage( { ...repoDescr, options, imageVersion } )
 log( chalk.blue.bold( 'Done Building the Docker Image...' ) )
 
 if ( willGitTag ) {

package/src/templates/cloudBuildSteps.hbs

@@ -2,20 +2,14 @@ options:
   machineType: E2_HIGHCPU_8
 
 steps:
-  {{#each imagePlatformList}}
   - name: 'gcr.io/cloud-builders/docker'
     entrypoint: 'bash'
-    args: ['-c', 'docker pull --platform={{this}} {{imageName}}:latest || exit 0']
-    waitFor: ['-']
-  {{/each}}
-
-  - name: 'gcr.io/cloud-builders/docker'
-    args: ['buildx', 'create', '--driver', 'docker-container', '--name', 'container', '--driver-opt', 'network=cloudbuild', '--use']
+    args: ['-c', 'docker pull {{imageName}}:latest || exit 0']
 
   - name: 'gcr.io/cloud-builders/docker'
     args:
-      - 'buildx'
       - 'build' 
+      - '--platform={{imagePlatform}}'
       - '--network=cloudbuild'
       - '-t'
       - '{{imageName}}:{{imageVersion}}'