@leverege/build-tools 2.68.0 → 2.68.2-beta.1

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.
Files changed (5) hide show
  1. package/.vscode/settings.json +3 -0
  2. package/package.json +1 -1
  3. package/src/Utils.mjs +8 -1
  4. package/src/docker-to-registry.mjs +3 -3
  5. package/src/templates/dockerfileTemplatePython.hbs +1 -3
package/.vscode/settings.json ADDED
@@ -0,0 +1,3 @@
1
+ {
2
+ "editor.formatOnSave": false
3
+ }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@leverege/build-tools",
3
- "version": "2.68.0",
3
+ "version": "2.68.2-beta.1",
4
4
  "description": "A collection of build / support tools for Leverege developers",
5
5
  "main": "index.js",
6
6
  "repository": {
package/src/Utils.mjs CHANGED
@@ -537,7 +537,14 @@ export const analyzeRepository = async ( giveGuidance ) => {
537
537
  process.exit( 1 )
538
538
  }
539
539
 
540
- log( chalk.green.bold( '\nParsing and analyzing the package.json file\n' ) )
540
+ if ( isNodeJsProject ) {
541
+ log( chalk.green.bold( '\nParsing and analyzing the package.json file\n' ) )
542
+ }
543
+
544
+ if ( isPythonProject ) {
545
+ log( chalk.green.bold( '\nParsing and analyzing the pyproject.toml file\n' ) )
546
+ }
547
+
541
548
  let closestPackageJson
542
549
  try {
543
550
  closestPackageJson = await parsePackageJson( './package.json' )
package/src/docker-to-registry.mjs CHANGED
@@ -110,9 +110,9 @@ const leveregeStanza = isNodeJsProject ? repoDescr.closestPackageJson.leverege :
110
110
  const dockerInfo = await docker.generateDockerfile( {
111
111
  isNodeJsProject,
112
112
  isPythonProject,
113
- buildEnv : leveregeStanza.buildEnv || leveregeStanza.buildenv || 'alpine',
114
- imageBase : leveregeStanza.imageBase,
115
- runuser : leveregeStanza.runUser || leveregeStanza.runuser || isNodeJsProject ? 'node' : 'python',
113
+ buildEnv : leveregeStanza.buildEnv || leveregeStanza['build-env'] || 'alpine',
114
+ imageBase : leveregeStanza.imageBase || leveregeStanza['image-base'],
115
+ runuser : leveregeStanza.runUser || leveregeStanza['run-user'] || isNodeJsProject ? 'node' : 'python',
116
116
  nodeimage : leveregeStanza.nodeimg, // left as nodeimg in package.json for backwards compat
117
117
  regvers : repoDescr.packageVersion,
118
118
  pythonVersion : repoDescr.rootPyProjectToml?.pythonVersion,
package/src/templates/dockerfileTemplatePython.hbs CHANGED
@@ -46,9 +46,7 @@ COPY --chown=python:python ./workspace/pyproject.toml \
46
46
  /usr/src/app/
47
47
 
48
48
  # Sync dependencies
49
- RUN uv sync --keyring-provider subprocess \
50
- --extra-index-url https://oauth2accesstoken@us-python.pkg.dev/leverege-registry/leverege-python-packages/simple \
51
- && rm -rf /home/{{runuser}}/.cache
49
+ RUN uv sync && rm -rf /home/{{runuser}}/.cache
52
50
 
53
51
  # Copy application source AFTER venv + tool setup
54
52
  COPY --chown={{runuser}}:{{runuser}} ./workspace/ /usr/src/app/