@leverege/build-tools 2.93.0-quinn.13 → 2.93.0-quinn.3

package/package.json

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

package/src/Docker.mjs

@@ -121,14 +121,13 @@ const generateDockerfile = async ( options ) => {
     fs.writeFileSync( dockerfilePlugin, dockerfilePluginTemplate )
   }
 
-  const buildDir = options.isYarnProject ? `/tmp/${options.containerName}/build` : './build'
   try {
-    const build = fs.readdirSync( buildDir )
+    const build = fs.readdirSync( './build' )
     if ( build.length === 0 ) {
       errorExit( `***ERROR: the build dir is empty - ${chalk.yellow( 'npm run build' )}` )
     }
   } catch ( err ) {
-    errorExit( `***ERROR: expected the ${buildDir} directory to exist - ${chalk.yellow( 'npm run build' )}` )
+    errorExit( `***ERROR: expected the ./build directory to exist - ${chalk.yellow( 'npm run build' )}` )
   }
 
   // At this point the docker plugin file better exist.
@@ -185,8 +184,7 @@ const buildContainerImage = async ( repoDescr ) => {
     isPythonProject,
     isYarnProject
   } = repoDescr
-  const buildDir = isYarnProject ? `/tmp/${containerName}/build` : './build'
-  const buildWorkspace = `${buildDir}/workspace` // passed to Cloud Build
+  const buildWorkspace = './build/workspace' // passed to Cloud Build
   const imageName = `${artifactRegistry}/images/${containerName}`
 
   if ( fs.existsSync( buildWorkspace ) ) {
@@ -206,24 +204,23 @@ const buildContainerImage = async ( repoDescr ) => {
   //   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( buildDir, path.join( path.dirname( buildDir ), 'workspace' ) )
-  fs.mkdirSync( buildDir )
-  fs.renameSync( path.join( path.dirname( buildDir ), 'workspace' ), buildWorkspace )
-  fs.cpSync( './docker/Dockerfile', `${buildDir}/Dockerfile` )
-  fs.cpSync( `${buildDir}/Dockerfile`, `${buildWorkspace}/Dockerfile` )
+  fs.renameSync( './build', './workspace' )
+  fs.mkdirSync( './build' )
+  fs.renameSync( './workspace', buildWorkspace )
+  fs.cpSync( './docker/Dockerfile', './build/Dockerfile' )
+  fs.cpSync( './build/Dockerfile', `${buildWorkspace}/Dockerfile` )
 
   // bashrc won't exist if we're opting out of dockerfile generation
   if ( fs.existsSync( './docker/bashrc' ) ) {
-    fs.renameSync( './docker/bashrc', `${buildDir}/bashrc` )
+    fs.renameSync( './docker/bashrc', './build/bashrc' )
   }
 
   if ( isNodeJsProject ) {
-    
+    fs.cpSync( './package.json', `${buildWorkspace}/package.json` )
     if ( isYarnProject ) {
-      fs.cpSync( `${process.env.HOME}/.yarnrc.yml`, `${buildDir}/.yarnrc.yml` )
+      fs.cpSync( `${process.env.HOME}/.yarnrc.yml`, './build/.yarnrc.yml' )
     } else {
-      fs.cpSync( './package.json', `${buildWorkspace}/package.json` )
-      fs.cpSync( `${process.env.HOME}/.npmrc`, `${buildDir}/.npmrc` )
+      fs.cpSync( `${process.env.HOME}/.npmrc`, './build/.npmrc' )
       fs.cpSync( './package-lock.json', `${buildWorkspace}/package-lock.json` )
     }
   }
@@ -239,7 +236,7 @@ const buildContainerImage = async ( repoDescr ) => {
   const gcloudProjectNumber = await shellCmd( `gcloud projects describe ${artifactProject} --format="value(projectNumber)"` )
   
   // build the cloudbuild.yaml from the handlebars template
-  const cloudBuildFile = `${buildDir}/cloudbuild.yaml`
+  const cloudBuildFile = './build/cloudbuild.yaml'
   let cloudBuildSteps
   let imagePlatformString
   if ( isPythonProject || ( imagePlatform.length === 1 && imagePlatform[0] === 'linux/arm64' ) || imagePlatform.length > 1 ) {
@@ -269,12 +266,12 @@ const buildContainerImage = async ( repoDescr ) => {
   ` ) )
 
   if ( process.env.DRY_RUN === '1' ) {
-    log( `Would have run => ${cloudBuildCmd} ${cloudBuildLogs} ${cloudBuildCfg} ${buildDir}` )
+    log( `Would have run => ${cloudBuildCmd} ${cloudBuildLogs} ${cloudBuildCfg} ./build` )
     log( '\n***Exiting from DRY_RUN\n' )
     process.exit( 0 )
   }
 
-  await shellCmd( `${cloudBuildCmd} ${cloudBuildLogs} ${cloudBuildCfg} ${buildDir}`, { stdio : 'inherit' } )
+  await shellCmd( `${cloudBuildCmd} ${cloudBuildLogs} ${cloudBuildCfg} ./build`, { stdio : 'inherit' } )
 }
 
 const repoCleanup = async () => {

package/src/Utils.mjs

@@ -562,7 +562,6 @@ export const analyzeRepository = async ( giveGuidance ) => {
     rootPackageJson,
     rootPyProjectToml,
     isNpmWorkspace,
-    isYarnProject
   } = await getRepositoryDescr()
 
   if ( isMonoRepo && rootPackageJson.isInvalid ) {
@@ -671,6 +670,5 @@ export const analyzeRepository = async ( giveGuidance ) => {
     packageVersion,
     subPkgs,
     wsName,
-    isYarnProject
   }
 }

package/src/docker-to-registry.mjs

@@ -98,8 +98,7 @@ const {
   isNpmWorkspace,
   isNodeJsProject,
   isPythonProject,
-  isYarnProject,
-  closestPackageJson
+  isYarnProject
 } = repoDescr
 
 if ( requiresHelmChart ) {
@@ -116,16 +115,7 @@ if ( requiresHelmChart ) {
   }
 }
 
-const leveregeStanza = isNodeJsProject ? closestPackageJson.leverege : repoDescr.rootPyProjectToml.leverege
-let runCommand = 'node index.js'
-
-if ( isYarnProject ) {
-  if ( isNpmWorkspace ) {
-    runCommand = `yarn workspace ${closestPackageJson.name} run start`
-  } else {
-    runCommand = 'yarn start'
-  }
-}
+const leveregeStanza = isNodeJsProject ? repoDescr.closestPackageJson.leverege : repoDescr.rootPyProjectToml.leverege
 
 const dockerfileOptions = {
   isNodeJsProject,
@@ -139,8 +129,6 @@ const dockerfileOptions = {
   pythonVersion : repoDescr.rootPyProjectToml?.pythonVersion,
   previousBuild : docker.getPreviousBuild(),
   date : getDateTimestamp(),
-  containerName,
-  runCommand
 }
 let dockerInfo
 if ( generateDockerfile ) {
@@ -163,7 +151,9 @@ const registryFolder = `${artifactRegistry}/images/${containerName}`
 if ( isNodeJsProject ) {
   // Update the dependencies...
   log( chalk.green.bold( 'Updating dependencies and workspace...' ) )
-  if ( !isYarnProject ) {
+  if ( isYarnProject ) {
+    await shellCmd( 'yarn install', { stdio : 'inherit' } )
+  } else {
     await shellCmd( 'npm install', { stdio : 'inherit' } )
   }
 }

package/src/templates/dockerfileTemplateNodeJs.hbs

@@ -7,11 +7,9 @@ FROM {{image}} as intermediate
 ARG BUILD_ENV="{{buildEnv}}"
 
 ENV NODE_ENV production
-{{#if isYarnProject}}
-ENV COREPACK_HOME /usr/src/.cache/node
-{{else}}
+{{#unless isYarnProject}}
 ENV NPM_CONFIG_USERCONFIG /usr/src/app/.npmrc
-{{/if}}
+{{/unless}}
 
 RUN mkdir -p /usr/src/app
 WORKDIR /usr/src/app
@@ -35,6 +33,8 @@ RUN if [ "${BUILD_ENV}" = "debian" ]; then \
       apt-get update && \
       apt-get install -y wget openssh-client build-essential && \
       {{#if isYarnProject}}
+      npm install -g {{npmVersion}} && \
+      npm install -g corepack && \
       corepack enable && \
       corepack prepare yarn@stable --activate; \
       {{else}}
@@ -44,6 +44,8 @@ RUN if [ "${BUILD_ENV}" = "debian" ]; then \
       apk --no-cache add openssh-client && \
       apk --update add --no-cache --virtual build-dep g++ gcc libgcc libstdc++ linux-headers make {{apkadds}} && \
       {{#if isYarnProject}}
+      npm install -g {{npmVersion}} && \
+      npm install -g corepack && \
       corepack enable && \
       corepack prepare yarn@stable --activate; \
       {{else}}
@@ -73,11 +75,9 @@ FROM {{image}}
 
 ARG BUILD_ENV="{{buildEnv}}"
 
-{{#if isYarnProject}}
-ENV COREPACK_HOME /usr/src/.cache/node
-{{else}}
+{{#unless isYarnProject}}
 ENV NPM_CONFIG_USERCONFIG /usr/src/app/.npmrc
-{{/if}}
+{{/unless}}
 
 # Copy .npmrc for private registry access for access to any @leverege packages
 {{#if isYarnProject}}
@@ -90,22 +90,22 @@ COPY ./.npmrc ${NPM_CONFIG_USERCONFIG}
 RUN if [ "$BUILD_ENV" = "debian" ]; then \
       apt-get update && \
       apt-get install -y tini bash curl vim {{apkadds}} && \
+      npm install -g {{npmVersion}} && \
       {{#if isYarnProject}}
+      npm install -g corepack && \
       corepack enable && \
       corepack prepare yarn@stable --activate && \
-      {{else}}
-      npm install -g {{npmVersion}} && \
       {{/if}}
       rm /bin/sh && ln -s /bin/bash /bin/sh && \
       mkdir -p /usr/src/app /tmp/levlog && chown node:node /usr/src/app; \
     else \
       apk update && \
       apk add --no-cache bash curl tini vim {{apkadds}} && \
+      npm install -g {{npmVersion}} && \
       {{#if isYarnProject}}
+      npm install -g corepack && \
       corepack enable && \
       corepack prepare yarn@stable --activate && \
-      {{else}}
-      npm install -g {{npmVersion}} && \
       {{/if}}
       rm /bin/sh && ln -s /bin/bash /bin/sh && \
       mkdir -p /usr/src/app /tmp/levlog && chown node:node /usr/src/app; \
@@ -129,4 +129,4 @@ COPY --chown=node:node --from=intermediate /usr/src/app /usr/src/app
 
 USER {{runuser}}
 COPY ./bashrc /home/node/.bashrc
-CMD [ "/bin/bash", "-c", "source /home/node/.bashrc && {{runCommand}}" ]
+CMD [ "/bin/bash", "-c", "source /home/node/.bashrc && node index.js" ]