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

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.1",
   "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,17 +113,21 @@ const {
 
 const leveregeStanza = isNodeJsProject ? repoDescr.closestPackageJson.leverege : repoDescr.rootPyProjectToml.leverege
 
-const dockerInfo = await docker.generateDockerfile( {
-  isNodeJsProject,
-  isPythonProject,
-  buildEnv : leveregeStanza.buildEnv || leveregeStanza['build-env'] || 'alpine',
-  imageBase : leveregeStanza.imageBase || leveregeStanza['image-base'],
-  runuser : leveregeStanza.runUser || leveregeStanza['run-user'] || isNodeJsProject ? 'node' : 'python',
-  nodeimage : leveregeStanza.nodeimg, // left as nodeimg in package.json for backwards compat
-  regvers : repoDescr.packageVersion,
-  pythonVersion : repoDescr.rootPyProjectToml?.pythonVersion,
-} )
-debug( { dockerInfo }, '<==The Docker Info' )
+if ( generateDockerfile ) {
+  const dockerInfo = await docker.generateDockerfile( {
+    isNodeJsProject,
+    isPythonProject,
+    buildEnv : leveregeStanza.buildEnv || leveregeStanza['build-env'] || 'alpine',
+    imageBase : leveregeStanza.imageBase || leveregeStanza['image-base'],
+    runuser : leveregeStanza.runUser || leveregeStanza['run-user'] || isNodeJsProject ? 'node' : 'python',
+    nodeimage : leveregeStanza.nodeimg, // left as nodeimg in package.json for backwards compat
+    regvers : repoDescr.packageVersion,
+    pythonVersion : repoDescr.rootPyProjectToml?.pythonVersion,
+  } )
+  debug( { dockerInfo }, '<==The Docker Info' )
+} else if ( !fs.existsSync( './docker/Dockerfile' ) ) {
+  errorExit( '***ERROR: docker/Dockerfile does not exist and dockerfile generation is disabled' )
+}
 
 if ( giveGuidance ) {
   await docker.validateCloudBuildBucket( artifactProject )