@leverege/build-tools 2.85.0-beta.1 → 2.85.0-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-to-registry.mjs +13 -11
package/package.json
CHANGED
|
@@ -113,19 +113,22 @@ const {
|
|
|
113
113
|
|
|
114
114
|
const leveregeStanza = isNodeJsProject ? repoDescr.closestPackageJson.leverege : repoDescr.rootPyProjectToml.leverege
|
|
115
115
|
|
|
116
|
+
const dockerfileOptions = {
|
|
117
|
+
isNodeJsProject,
|
|
118
|
+
isPythonProject,
|
|
119
|
+
buildEnv : leveregeStanza.buildEnv || leveregeStanza['build-env'] || 'alpine',
|
|
120
|
+
imageBase : leveregeStanza.imageBase || leveregeStanza['image-base'],
|
|
121
|
+
runuser : leveregeStanza.runUser || leveregeStanza['run-user'] || isNodeJsProject ? 'node' : 'python',
|
|
122
|
+
nodeimage : leveregeStanza.nodeimg, // left as nodeimg in package.json for backwards compat
|
|
123
|
+
regvers : repoDescr.packageVersion,
|
|
124
|
+
pythonVersion : repoDescr.rootPyProjectToml?.pythonVersion,
|
|
125
|
+
}
|
|
126
|
+
let dockerInfo
|
|
116
127
|
if ( generateDockerfile ) {
|
|
117
|
-
|
|
118
|
-
isNodeJsProject,
|
|
119
|
-
isPythonProject,
|
|
120
|
-
buildEnv : leveregeStanza.buildEnv || leveregeStanza['build-env'] || 'alpine',
|
|
121
|
-
imageBase : leveregeStanza.imageBase || leveregeStanza['image-base'],
|
|
122
|
-
runuser : leveregeStanza.runUser || leveregeStanza['run-user'] || isNodeJsProject ? 'node' : 'python',
|
|
123
|
-
nodeimage : leveregeStanza.nodeimg, // left as nodeimg in package.json for backwards compat
|
|
124
|
-
regvers : repoDescr.packageVersion,
|
|
125
|
-
pythonVersion : repoDescr.rootPyProjectToml?.pythonVersion,
|
|
126
|
-
} )
|
|
128
|
+
dockerInfo = await docker.generateDockerfile( dockerfileOptions )
|
|
127
129
|
debug( { dockerInfo }, '<==The Docker Info' )
|
|
128
130
|
} else if ( !fs.existsSync( './docker/Dockerfile' ) ) {
|
|
131
|
+
dockerInfo = { ...dockerfileOptions }
|
|
129
132
|
errorExit( '***ERROR: docker/Dockerfile does not exist and dockerfile generation is disabled' )
|
|
130
133
|
}
|
|
131
134
|
|
|
@@ -258,7 +261,6 @@ if ( isPythonProject ) {
|
|
|
258
261
|
Platform: ${chalk.green.bold( dockerInfo.imagePlatform )}
|
|
259
262
|
Python Ver: ${chalk.green.bold( dockerInfo.pythonVersion )}
|
|
260
263
|
Run User: ${chalk.green.bold( dockerInfo.runuser )}
|
|
261
|
-
Previous: ${chalk.yellow.bold( dockerInfo.previousBuild )}
|
|
262
264
|
DateStamp: ${chalk.green.bold( dockerInfo.date )}
|
|
263
265
|
` )
|
|
264
266
|
}
|