@leverege/build-tools 2.116.0 → 2.117.0

package/package.json

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

package/src/Docker.mjs

@@ -148,6 +148,10 @@ const generateDockerfile = async ( options ) => {
   if ( fs.existsSync( dockerfilePrePlugin ) ) {
     settings.preInstallPluginfile = fs.readFileSync( dockerfilePrePlugin )
   }
+  const dockerfileFinalStagePrePlugin = './docker/DockerfileFinalStagePreInstall.plugin'
+  if ( fs.existsSync( dockerfileFinalStagePrePlugin ) ) {
+    settings.finalStagePreInstallPluginfile = fs.readFileSync( dockerfileFinalStagePrePlugin )
+  }
 
   const compiled = handlebars.compile( dockerfileTemplate, { noEscape : true } )
   const replaced = compiled( settings )

package/src/docker-to-registry.mjs

@@ -129,7 +129,7 @@ const dockerfileOptions = {
   isNpmWorkspace,
   buildEnv : leveregeStanza.buildEnv || leveregeStanza['build-env'] || 'alpine',
   imageBase : leveregeStanza.imageBase || leveregeStanza['image-base'],
-  runuser : leveregeStanza.runUser || leveregeStanza['run-user'] || isNodeJsProject ? 'node' : 'python',
+  runuser : leveregeStanza.runUser || leveregeStanza['run-user'] || ( isNodeJsProject ? 'node' : 'python' ),
   nodeimage : leveregeStanza.nodeimg, // left as nodeimg in package.json for backwards compat
   regvers : repoDescr.packageVersion,
   pythonVersion : repoDescr.rootPyProjectToml?.pythonVersion,

package/src/templates/dockerfileTemplateNodeJs.hbs

@@ -70,6 +70,7 @@ RUN npm ci --only=production --no-optional {{npmlogging}} && \
 # --------------------------------------------------------------
 
 FROM {{image}}
+{{finalStagePreInstallPluginfile}}
 
 ARG BUILD_ENV="{{buildEnv}}"
 
@@ -97,7 +98,7 @@ RUN if [ "$BUILD_ENV" = "debian" ]; then \
       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; \
+      mkdir -p /usr/src/app /tmp/levlog && chown {{runuser}}:{{runuser}} /usr/src/app; \
     else \
       apk update && \
       apk add --no-cache bash curl tini vim {{apkadds}} && \
@@ -108,7 +109,7 @@ RUN if [ "$BUILD_ENV" = "debian" ]; then \
       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; \
+      mkdir -p /usr/src/app /tmp/levlog && chown {{runuser}}:{{runuser}} /usr/src/app; \
     fi
 
 
@@ -125,8 +126,8 @@ RUN rm -f ${NPM_CONFIG_USERCONFIG}
 ENTRYPOINT [ "tini", "--" ]
 WORKDIR /usr/src/app
 
-COPY --chown=node:node --from=intermediate /usr/src/app /usr/src/app
+COPY --chown={{runuser}}:{{runuser}} --from=intermediate /usr/src/app /usr/src/app
 
 USER {{runuser}}
-COPY ./bashrc /home/node/.bashrc
-CMD [ "/bin/bash", "-c", "source /home/node/.bashrc && {{runCommand}}" ]
+COPY --chown={{runuser}}:{{runuser}} ./bashrc /home/{{runuser}}/.bashrc
+CMD [ "/bin/bash", "-c", "source /home/{{runuser}}/.bashrc && {{runCommand}}" ]