@leverege/build-tools 2.85.0-beta.6 → 2.85.0-beta.8
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.mjs +0 -2
- package/src/docker-to-registry.mjs +4 -1
package/package.json
CHANGED
package/src/Docker.mjs
CHANGED
|
@@ -8,7 +8,6 @@ import handlebars from 'handlebars'
|
|
|
8
8
|
import {
|
|
9
9
|
errorExit,
|
|
10
10
|
getCleanTag,
|
|
11
|
-
getDateTimestamp,
|
|
12
11
|
getGcpAccount,
|
|
13
12
|
log,
|
|
14
13
|
proceed,
|
|
@@ -53,7 +52,6 @@ const cloudBuildStepsMultiArch = fs.readFileSync( path.join( DIRNAME, './templat
|
|
|
53
52
|
|
|
54
53
|
const defaultSettings = {
|
|
55
54
|
apkadds : '',
|
|
56
|
-
date : getDateTimestamp(),
|
|
57
55
|
nodeimage : 'jod-alpine',
|
|
58
56
|
imageBase : 'node:jod-alpine',
|
|
59
57
|
npmlogging : process.env.VERBOSE_NPM_LOGGING ? '--ddd' : '--silent',
|
|
@@ -11,6 +11,7 @@ import {
|
|
|
11
11
|
debug, log,
|
|
12
12
|
errorExit,
|
|
13
13
|
analyzeRepository,
|
|
14
|
+
getDateTimestamp,
|
|
14
15
|
getGitBranchAndUpstream,
|
|
15
16
|
gitRepoIsDirty,
|
|
16
17
|
proceed,
|
|
@@ -123,14 +124,16 @@ const dockerfileOptions = {
|
|
|
123
124
|
regvers : repoDescr.packageVersion,
|
|
124
125
|
pythonVersion : repoDescr.rootPyProjectToml?.pythonVersion,
|
|
125
126
|
previousBuild : docker.getPreviousBuild(),
|
|
127
|
+
date : getDateTimestamp(),
|
|
126
128
|
}
|
|
127
129
|
let dockerInfo
|
|
128
130
|
if ( generateDockerfile ) {
|
|
129
131
|
dockerInfo = await docker.generateDockerfile( dockerfileOptions )
|
|
130
132
|
debug( { dockerInfo }, '<==The Docker Info' )
|
|
131
133
|
} else if ( !fs.existsSync( './docker/Dockerfile' ) ) {
|
|
132
|
-
dockerInfo = { ...dockerfileOptions }
|
|
133
134
|
errorExit( '***ERROR: docker/Dockerfile does not exist and dockerfile generation is disabled' )
|
|
135
|
+
} else {
|
|
136
|
+
dockerInfo = { ...dockerfileOptions }
|
|
134
137
|
}
|
|
135
138
|
|
|
136
139
|
if ( giveGuidance ) {
|