@leverege/build-tools 2.68.3-beta.1 → 2.68.3-beta.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/package.json +1 -1
- package/src/Docker.mjs +2 -1
- package/src/docker-to-registry.mjs +2 -0
package/package.json
CHANGED
package/src/Docker.mjs
CHANGED
|
@@ -230,13 +230,14 @@ const buildContainerImage = async ( repoDescr ) => {
|
|
|
230
230
|
const cloudBuildFile = './build/cloudbuild.yaml'
|
|
231
231
|
let cloudBuildSteps
|
|
232
232
|
let imagePlatformString
|
|
233
|
-
if ( !imagePlatform || imagePlatform[0] === 'linux/amd64' ) {
|
|
233
|
+
if ( !imagePlatform || ( imagePlatform.length === 1 && imagePlatform[0] === 'linux/amd64' ) ) {
|
|
234
234
|
cloudBuildSteps = cloudBuildStepsSingleArch
|
|
235
235
|
imagePlatformString = 'linux/amd64'
|
|
236
236
|
} else {
|
|
237
237
|
cloudBuildSteps = cloudBuildStepsMultiArch
|
|
238
238
|
imagePlatformString = imagePlatform.join( ',' )
|
|
239
239
|
}
|
|
240
|
+
log( `imagePlatformString => ${imagePlatformString}` )
|
|
240
241
|
const cbst = handlebars.compile( cloudBuildSteps, { noEscape : true } )
|
|
241
242
|
const cbs = cbst( { artifactProject, artifactRegistry, imageName, imagePlatform : imagePlatformString, imageVersion, imageInfoTag, } )
|
|
242
243
|
fs.writeFileSync( cloudBuildFile, cbs )
|
|
@@ -229,6 +229,7 @@ if ( isNodeJsProject ) {
|
|
|
229
229
|
log( `
|
|
230
230
|
${chalk.green.bold( 'NodeJS Docker Information:' )}
|
|
231
231
|
NodeImage: ${chalk.green.bold( dockerInfo.imageBase || `node:${dockerInfo.nodeimage}` )}
|
|
232
|
+
Platform: ${chalk.green.bold( dockerInfo.imagePlatform )}
|
|
232
233
|
Docker Env: ${chalk.green.bold( dockerInfo.buildEnv || 'alpine' )}
|
|
233
234
|
AddedPkgs: ${chalk.green.bold( dockerInfo.apkadds )}
|
|
234
235
|
Run User: ${chalk.green.bold( dockerInfo.runuser )}
|
|
@@ -243,6 +244,7 @@ if ( isPythonProject ) {
|
|
|
243
244
|
log( `
|
|
244
245
|
${chalk.green.bold( 'Python Docker Information:' )}
|
|
245
246
|
BaseImage: ${chalk.green.bold( dockerInfo.imageBase || `node:${dockerInfo.nodeimage}` )}
|
|
247
|
+
Platform: ${chalk.green.bold( dockerInfo.imagePlatform )}
|
|
246
248
|
Python Ver: ${chalk.green.bold( dockerInfo.pythonVersion )}
|
|
247
249
|
Run User: ${chalk.green.bold( dockerInfo.runuser )}
|
|
248
250
|
Previous: ${chalk.yellow.bold( dockerInfo.previousBuild )}
|