@leverege/build-tools 2.61.2 → 2.61.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leverege/build-tools",
-  "version": "2.61.2",
+  "version": "2.61.4",
   "description": "A collection of build / support tools for Leverege developers",
   "main": "index.js",
   "repository": {
@@ -19,7 +19,6 @@
     "build-cnpg-image": "src/build-cnpg-image.mjs",
     "chart-to-registry": "src/chart-to-registry.mjs",
     "circleate": "src/circleate.sh",
-    "cnpg-backup": "src/cnpg-backup.mjs",
     "decrypt-secrets": "src/decrypt-secrets.sh",
     "dirty-git": "src/dirty-git.sh",
     "dockreate": "src/dockreate.sh",
@@ -53,6 +52,7 @@
     "refresh-npm-token": "src/refresh-npm-token.mjs",
     "refresh-py-idx": "src/refresh-py-idx.sh",
     "send-to-slack": "src/send-to-slack.mjs",
+    "snapshot-cnpg": "src/snapshot-cnpg.mjs",
     "tag-release": "src/tag-release.mjs",
     "unleash": "src/unleash.mjs"
   },

package/src/Utils.mjs

@@ -399,6 +399,7 @@ export const getRepositoryDescr = async () => {
   const currentDir = process.cwd()
   const workingDir = process.env.PWD
   const gitRoot = await getGitRootDirectory()
+  const isGitRepo = gitRoot !== undefined
   const gitHooksPath = await getGitHooksPath()
   const { branch : gitBranch, upstream : gitUpstream } = await getGitBranchAndUpstream()
   const subPkgs = await glob( `${gitRoot}/packages/**/package.json`, { ignore : '/**/node_modules/**' } )
@@ -420,6 +421,7 @@ export const getRepositoryDescr = async () => {
     gitRoot,
     gitUpstream,
     helmChart,
+    isGitRepo,
     isMonoRepo,
     isNpmWorkspace,
     rootPackageJson,

package/src/helm-charts/prom-operator/helmup.plugin

@@ -4,20 +4,23 @@ showInstalling "The Prometheus Operator and Components"
 addHelmRepo prometheus-community https://prometheus-community.github.io/helm-charts
 
 showInstalling "The Prometheus Operator (kube-prometheus-stack)"
-[ -z "$PROMETHEUS_STACK_CHART_VERSION" ] && PROMETHEUS_STACK_CHART_VERSION="67"
+[ -z "$PROMETHEUS_STACK_CHART_VERSION" ] && PROMETHEUS_STACK_CHART_VERSION="68"
 
 NS="--namespace prometheus"
 
+# https://artifacthub.io/packages/helm/prometheus-community/kube-prometheus-stack
 helm upgrade $NS --install prometheus-stack prometheus-community/kube-prometheus-stack \
                  --values  prom-operator/prometheus-stack.yaml \
                  --version $PROMETHEUS_STACK_CHART_VERSION $HELM_WHAT
 
+# https://artifacthub.io/packages/helm/prometheus-community/prometheus-elasticsearch-exporter
 showInstalling "The Elasticsearch Exporter (prom-operator)"
 [ -z "$ELASTICSEARCH_EXPORTER_CHART_VERSION" ] && ELASTICSEARCH_EXPORTER_CHART_VERSION="6"
 helm upgrade $NS --install elasticsearch8-exporter prometheus-community/prometheus-elasticsearch-exporter \
                  --values prom-operator/elasticsearch-exporter.yaml \
                  --version $ELASTICSEARCH_EXPORTER_CHART_VERSION $HELM_WHAT
 
+# https://artifacthub.io/packages/helm/prometheus-community/prometheus-stackdriver-exporter
 showInstalling "The Stackdriver Exporter (prom-operator)"
 [ -z "$STACKDRIVER_EXPORTER_CHART_VERSION" ] && STACKDRIVER_EXPORTER_CHART_VERSION="4"
 helm upgrade $NS --install stackdriver-exporter prometheus-community/prometheus-stackdriver-exporter \

package/src/hook-and-release/Config.mjs

@@ -128,6 +128,15 @@ export default class Config {
 
   async bootstrapHookAndRelease() {
     const repoDescr = await getRepositoryDescr()
+    if ( !repoDescr.isGitRepo ) {
+      const notGitRepo = `
+  The hook-and-release script only works with git repositories. Try running:
+
+      git init && hook-and-release --init
+
+  to initialize git and hook-and-release.`
+      errorExit( notGitRepo )
+    }
     this.gitRoot = repoDescr.gitRoot
     this.gitBranch = repoDescr.gitBranch
     this.gitHooksPath = repoDescr.gitHooksPath

package/src/templates/dockerfileTemplate.hbs

@@ -25,11 +25,11 @@ COPY ./.npmrc ${NPM_CONFIG_USERCONFIG}
 RUN if [ "${BUILD_ENV}" = "debian" ]; then \
       apt-get update && \
       apt-get install -y wget openssh-client build-essential && \
-      npm install -g npm@10; \
+      npm install -g {{npmVersion}}; \
     else \
       apk --no-cache add openssh-client && \
       apk --update add --no-cache --virtual build-dep g++ gcc libgcc libstdc++ linux-headers make {{apkadds}} && \
-      npm install -g npm@10; \
+      npm install -g {{npmVersion}}; \
     fi
 
 # Use SKIP_PREPARE to disable hook-and-release from running
@@ -58,13 +58,13 @@ 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 npm@10 && \
+      npm install -g {{npmVersion}} && \
       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 npm@10 && \
+      npm install -g {{npmVersion}} && \
       rm /bin/sh && ln -s /bin/bash /bin/sh && \
       mkdir -p /usr/src/app /tmp/levlog && chown node:node /usr/src/app; \
     fi
@@ -83,4 +83,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 && node index.js" ]
+CMD [ "/bin/bash", "-c", "source /home/node/.bashrc && node index.js" ]