@leverege/build-tools 2.61.6 → 2.61.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leverege/build-tools",
-  "version": "2.61.6",
+  "version": "2.61.7",
   "description": "A collection of build / support tools for Leverege developers",
   "main": "index.js",
   "repository": {
@@ -67,7 +67,7 @@
     "execa": "^9.5.2",
     "glob": "^11.0.1",
     "handlebars": "^4.7.8",
-    "inquirer": "^12.3.3",
+    "inquirer": "^12.4.1",
     "js-yaml": "^4.1.0",
     "jsdoc": "^4.0.4",
     "ms": "^2.1.3",
@@ -75,12 +75,12 @@
     "package-up": "^5.0.0",
     "parse-gitignore": "^2.0.0",
     "readline-sync": "^1.4.10",
-    "semver": "^7.7.0",
+    "semver": "^7.7.1",
     "simple-git": "^3.27.0",
-    "zx": "^8.3.1"
+    "zx": "^8.3.2"
   },
   "devDependencies": {
     "@leverege/eslint-config-leverege": "^5.0.1",
-    "npm": "^11.0.0"
+    "npm": "^11.1.0"
   }
 }

package/src/Docker.mjs

@@ -74,9 +74,10 @@ const setPreviousBuild = ( version ) => {
   fs.writeFileSync( previousFile, version )
 }
 
-const generateDockerfile = ( options ) => {
+const generateDockerfile = async ( options ) => {
 
-  const settings = { ...defaultSettings, ...options }
+  const gitReference = await shellCmd( 'git rev-parse --short HEAD' )
+  const settings = { gitReference, ...defaultSettings, ...options }
 
   // defaults to the current "official" version of node unless it gets
   // overridden in the leverege.nodeimg package.json stanza
@@ -188,10 +189,20 @@ const buildContainerImage = async ( {
   // TODO: This is janky - I'll clean it up later
   // NOTE: this is dealing with raw filesystem interactions, meaning there
   //   isn't a shell performing file globbing and what not
+  //
+  // Steps taken here attempt to minimize impact on legacy build setups
+  //   1. rename build dir to workspace
+  //   2. create the actual build dir and move workspace into it
+  //   3. move the Dockerfile into build and make a copy for image root
+  //   4. copy the bashrc file into build and .bashrc on the image root
+  //   5. drop a copy of dev's npmrc to use for build process
+  //   6. drop a copy of package.json and the lock into the image root
+  //
   fs.renameSync( './build', './workspace' )
   fs.mkdirSync( './build' )
   fs.renameSync( './workspace', buildWorkspace )
   fs.renameSync( './docker/Dockerfile', './build/Dockerfile' )
+  fs.cpSync( './build/Dockerfile', `${buildWorkspace}/Dockerfile` )
   fs.renameSync( './docker/bashrc', './build/bashrc' )
   fs.cpSync( `${process.env.HOME}/.npmrc`, './build/.npmrc' )
   fs.cpSync( './package.json', `${buildWorkspace}/package.json` )

package/src/docker-to-registry.mjs

@@ -272,7 +272,9 @@ if ( willGitTag ) {
   }
 }
 
-await proceed()
+if ( process.env.DRY_RUN !== '1' ) {
+  await proceed()
+}
 
 if ( isNpmWorkspace ) {
   log( chalk.yellow.bold( 'Generating an NPM workspace package-lock.json file' ) )

package/src/templates/dockerfileTemplate.hbs

@@ -1,4 +1,4 @@
-# Version {{regvers}} @ {{date}}
+# Version {{regvers}} @ {{date}} / Git Ref: {{gitReference}}
 
 # The FROM directive sets the Base Image for subsequent instructions
 FROM {{image}} as intermediate

package/registry-compass.yaml

@@ -1,20 +0,0 @@
-registry:
-  - root: us-docker.pkg.dev
-  - repositories:
-    - name: stack
-      charts:
-        - api-server
-        - authz-server
-        - emailer
-        - message-processor
-    - name: leverege
-      charts:
-        - pubsub-pulse
-        - pusher
-        - overdose
-    - name: cox-health
-      charts:
-        - actions-server
-        - analytics-server
-        - centrak-healthz
-        - centrak-ingestor