@leverege/build-tools 2.85.0-beta.7 → 2.85.0-beta.9

package/package.json

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

package/src/Docker.mjs

@@ -8,7 +8,6 @@ import handlebars from 'handlebars'
 import {
   errorExit,
   getCleanTag,
-  getDateTimestamp,
   getGcpAccount,
   log,
   proceed,
@@ -53,7 +52,6 @@ const cloudBuildStepsMultiArch = fs.readFileSync( path.join( DIRNAME, './templat
 
 const defaultSettings = {
   apkadds : '',
-  date : getDateTimestamp(),
   nodeimage : 'jod-alpine',
   imageBase : 'node:jod-alpine',
   npmlogging : process.env.VERBOSE_NPM_LOGGING ? '--ddd' : '--silent',
@@ -210,7 +208,12 @@ const buildContainerImage = async ( repoDescr ) => {
   fs.renameSync( './workspace', buildWorkspace )
   fs.cpSync( './docker/Dockerfile', './build/Dockerfile' )
   fs.cpSync( './build/Dockerfile', `${buildWorkspace}/Dockerfile` )
-  fs.renameSync( './docker/bashrc', './build/bashrc' )
+
+  // bashrc won't exist if we're opting out of dockerfile generation
+  if ( fs.existsSync( './docker/bashrc' ) ) {
+    fs.renameSync( './docker/bashrc', './build/bashrc' )
+  }
+
   if ( isNodeJsProject ) {
     fs.cpSync( `${process.env.HOME}/.npmrc`, './build/.npmrc' )
     fs.cpSync( './package.json', `${buildWorkspace}/package.json` )

package/src/docker-to-registry.mjs

@@ -11,6 +11,7 @@ import {
   debug, log,
   errorExit,
   analyzeRepository,
+  getDateTimestamp,
   getGitBranchAndUpstream,
   gitRepoIsDirty,
   proceed,
@@ -123,6 +124,7 @@ const dockerfileOptions = {
   regvers : repoDescr.packageVersion,
   pythonVersion : repoDescr.rootPyProjectToml?.pythonVersion,
   previousBuild : docker.getPreviousBuild(),
+  date : getDateTimestamp(),
 }
 let dockerInfo
 if ( generateDockerfile ) {
@@ -256,7 +258,6 @@ if ( isNodeJsProject ) {
 }
 
 if ( isPythonProject ) {
-  log( `dockerInfo => ${JSON.stringify( dockerInfo, null, 2 )}` )
   log( `
   ${chalk.green.bold( 'Python Docker Information:' )}
     BaseImage:     ${chalk.green.bold( dockerInfo.imageBase || `node:${dockerInfo.nodeimage}` )}