@leverege/build-tools 2.114.1 → 2.115.1

package/package.json

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

package/src/docker-to-registry.mjs

@@ -108,7 +108,19 @@ if ( requiresHelmChart ) {
 }
 
 const leveregeStanza = isNodeJsProject ? closestPackageJson.leverege : repoDescr.rootPyProjectToml.leverege
-const runCommand = isYarnProject ? 'node entrypoint.mjs' : 'node index.js'
+// Python projects place the entrypoint at src/server.py (node parity) or, for older projects,
+// scripts/server.py. Detection happens here so the image CMD is fixed at build time.
+const pythonEntrypoint = () => {
+  if ( fs.existsSync( './src/server.py' ) ) {
+    return 'src/server.py'
+  }
+  warning( `entrypoints under scripts/ are deprecated - move server.py to ${chalk.green.bold( 'src/server.py' )} for parity with node services` )
+  return 'scripts/server.py'
+}
+
+const runCommand = isNodeJsProject ?
+  ( isYarnProject ? 'node entrypoint.mjs' : 'node index.js' ) :
+  `python ${pythonEntrypoint()}`
 
 const dockerfileOptions = {
   isNodeJsProject,

package/src/prepack.mjs

@@ -18,15 +18,20 @@ const { compile, 'manual-tag' : manualTag, 'force-tag' : forceTag, 'push-tag' :
   boolean : [ 'compile', 'manual-tag', 'force-tag', 'push-tag' ]
 } )
 
-try {
-  await $`git diff --exit-code --quiet`
-} catch ( err ) {
-  console.log( chalk.redBright( 'Your git index is not clean. Stage and/or commit all changes before attempting to publish a version to npm.' ) )
-  process.exit( err.exitCode )
-}
-
-const isYarn = ( await fs.exists( path.join( process.cwd(), 'yarn.lock' ) ) ) || ( await fs.exists( path.join( process.cwd(), '.yarn' ) ) )
 const packageJson = await fs.readJSON( path.join( process.cwd(), 'package.json' ) )
+const isYarn = ( await fs.exists( path.join( process.cwd(), 'yarn.lock' ) ) ) || ( await fs.exists( path.join( process.cwd(), '.yarn' ) ) )
+const version = packageJson.version
+const semanticVersion = semverParse( version )
+const isPrerelease = semanticVersion.prerelease.length > 0
+
+if ( !isPrerelease ) {
+  try {
+    await $`git diff --exit-code --quiet`
+  } catch ( err ) {
+    console.log( chalk.redBright( 'Your git index is not clean. Stage and/or commit all changes before attempting to publish a version to npm.' ) )
+    process.exit( err.exitCode )
+  }
+}
 
 if ( compile && packageJson.scripts?.compile != null ) {
   try {
@@ -38,10 +43,6 @@ if ( compile && packageJson.scripts?.compile != null ) {
   }
 }
 
-const version = packageJson.version
-const semanticVersion = semverParse( version )
-const isPrerelease = semanticVersion.prerelease.length > 0
-
 if ( !isPrerelease || forceTag ) {
   const name = packageJson.name.replace( /^@leverege\//, '' )
   const isWorkspace = await isInWorkspace( process.cwd() )
@@ -66,7 +67,7 @@ if ( !isPrerelease || forceTag ) {
     try {
       await $( {
         quiet : true
-      } )`git push --tags`
+      } )`git push origin ${tagName}`
     } catch ( error ) {
       process.stderr.write( chalk.redBright( 'Failed to push git tag with error:\n' ) )
       process.stderr.write( error.text() )
@@ -90,14 +91,14 @@ function compileCmd( { isYarn } ) {
 async function isInWorkspace( dir ) {
   const parent = path.dirname( dir )
   if ( parent === dir ) {
-    return false 
+    return false
   }
 
   const parentPkgPath = path.join( parent, 'package.json' )
   if ( await fs.exists( parentPkgPath ) ) {
     const pkg = JSON.parse( await fs.readFile( parentPkgPath, 'utf8' ) )
     if ( pkg.workspaces ) {
-      return true 
+      return true
     }
   }
 

package/src/templates/dockerfileTemplatePython.hbs

@@ -57,4 +57,4 @@ ENV PYTHONPATH="/usr/src/app/src"
 # Show final venv state (optional)
 RUN ls /usr/src/app/.venv/bin
 
-CMD [ "/bin/bash", "-c", "source /home/{{runuser}}/.bashrc && python scripts/server.py" ]
+CMD [ "/bin/bash", "-c", "source /home/{{runuser}}/.bashrc && {{runCommand}}" ]