@leverege/build-tools 2.84.0 → 2.85.0-beta.2

package/.vscode/settings.json

@@ -0,0 +1,3 @@
+{
+    "editor.formatOnSave": false
+}

package/package.json

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

package/src/Utils.mjs

@@ -579,7 +579,7 @@ export const analyzeRepository = async ( giveGuidance ) => {
   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}`
-
+  const generateDockerfile = closestPackageJson?.leverege.generateDockerfile || rootPyProjectToml?.leverege['generate-dockerfile'] || true
   const currentDir = process.cwd()
   const closestPkg = await packageUp()
 
@@ -605,6 +605,7 @@ export const analyzeRepository = async ( giveGuidance ) => {
     imagePlatform,
     currentDir,
     closestPkg,
+    generateDockerfile,
     gitRoot,
     gitRemote,
     helmChart,

package/src/docker-to-registry.mjs

@@ -104,6 +104,7 @@ const {
   packageVersion,
   containerName,
   imagePlatform,
+  generateDockerfile,
   helmChart,
   isNpmWorkspace,
   isNodeJsProject,
@@ -112,7 +113,7 @@ const {
 
 const leveregeStanza = isNodeJsProject ? repoDescr.closestPackageJson.leverege : repoDescr.rootPyProjectToml.leverege
 
-const dockerInfo = await docker.generateDockerfile( {
+const dockerfileOptions = {
   isNodeJsProject,
   isPythonProject,
   buildEnv : leveregeStanza.buildEnv || leveregeStanza['build-env'] || 'alpine',
@@ -121,8 +122,15 @@ const dockerInfo = await docker.generateDockerfile( {
   nodeimage : leveregeStanza.nodeimg, // left as nodeimg in package.json for backwards compat
   regvers : repoDescr.packageVersion,
   pythonVersion : repoDescr.rootPyProjectToml?.pythonVersion,
-} )
-debug( { dockerInfo }, '<==The Docker Info' )
+}
+let dockerInfo
+if ( generateDockerfile ) {
+  dockerInfo = await docker.generateDockerfile( dockerfileOptions )
+  debug( { dockerInfo }, '<==The Docker Info' )
+} else if ( !fs.existsSync( './docker/Dockerfile' ) ) {
+  dockerInfo = { ...dockerfileOptions }
+  errorExit( '***ERROR: docker/Dockerfile does not exist and dockerfile generation is disabled' )
+}
 
 if ( giveGuidance ) {
   await docker.validateCloudBuildBucket( artifactProject )
@@ -253,7 +261,6 @@ if ( isPythonProject ) {
     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 )}
     DateStamp:     ${chalk.green.bold( dockerInfo.date )}
   ` )
 }