@leverege/build-tools 2.47.0 → 2.47.1

package/package.json

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

package/src/Docker.mjs

@@ -5,6 +5,7 @@ import handlebars from 'handlebars'
 
 import {
   errorExit,
+  getDateTimestamp,
   getGcpAccount,
   log,
   proceed,
@@ -129,12 +130,9 @@ dunm() {
 }
 `
 
-// Just uses the old dockreate of formatting the date.
-const dateTimestamp = await shellCmd( 'date +%Y%m%d-%H%M' )
-
 const defaultSettings = {
   apkadds : '',
-  date : dateTimestamp,
+  date : getDateTimestamp(),
   nodeimage : 'iron-alpine',
   npmlogging : '--silent',
   pluginfile : '# NO PLUGIN',
@@ -292,7 +290,7 @@ const repoCleanup = async () => {
 
   fs.writeFileSync( 'docker/.gitignore', '.previous\nDockerfile' )
 
-  await shellCmd( 'git add docker' )
+  await shellCmd( 'git add -f docker' )
 
   log( `
   ${chalk.yellow.bold( '***IMPORTANT***' )}

package/src/docker-to-registry.mjs

@@ -224,9 +224,10 @@ if ( isNpmWorkspace ) {
 await docker.buildContainerImage( { artifactProject, artifactRegistry, containerName, imageVersion, isNpmWorkspace } )
 
 if ( willGitTag ) {
-  log( chalk.green.bold( `Tagging and Pushing ${imageVersion}\n` ) )
   const tagDescription = `docker_${imageVersion}`
-  await shellCmd( `git tag -f ${imageVersion} -m ${tagDescription}` )
+  const fullImageTag = repoDescr.isMonoRepo ? `${repoDescr.containerName}/${imageVersion}` : imageVersion
+  log( chalk.green.bold( `Tagging and Pushing ${fullImageTag}\n` ) )
+  await shellCmd( `git tag -f ${fullImageTag} -m ${tagDescription}` )
   await shellCmd( 'git push --follow-tags' )
 } else {
   log( chalk.yellow.bold( '\n*** Skipped git tagging - beta release' ) )