@catladder/cli 0.0.0-next-1cd29c1f → 0.0.0-next-f0ea63b5

package/dist/bundles/catenv/index.js

@@ -5136,7 +5136,7 @@ Object.defineProperty(exports, "__esModule", ({
   value: true
 }));
 exports.DOCKER_REGISTRY = exports.PIPELINE_IMAGE_TAG = void 0;
-exports.PIPELINE_IMAGE_TAG = "next-1cd29c1f" || 0;
+exports.PIPELINE_IMAGE_TAG = "next-f0ea63b5" || 0;
 exports.DOCKER_REGISTRY = "git.panter.ch:5001/catladder/catladder" || 0;
 
 /***/ }),
@@ -6151,7 +6151,9 @@ exports.RUNNER_IMAGE_BUILD_CONTEXT = {
  */
 const getShippedImagesDir = () => {
   const candidates = [
-  // built package: dist/customImages -> dist/runner-images
+  // built pipeline package: dist/customImages -> dist/runner-images
+  // bundled cli package (what consumers install): the ncc bundles live
+  // in dist/bundles/<name>, so both resolve to dist/bundles/runner-images
   (0, path_1.join)(__dirname, "..", "runner-images"),
   // repository: pipeline/src/customImages -> <root>/runner-images
   (0, path_1.join)(__dirname, "..", "..", "..", "runner-images")];

package/dist/bundles/cli/index.js

@@ -10309,7 +10309,7 @@ Object.defineProperty(exports, "__esModule", ({
   value: true
 }));
 exports.DOCKER_REGISTRY = exports.PIPELINE_IMAGE_TAG = void 0;
-exports.PIPELINE_IMAGE_TAG = "next-1cd29c1f" || 0;
+exports.PIPELINE_IMAGE_TAG = "next-f0ea63b5" || 0;
 exports.DOCKER_REGISTRY = "git.panter.ch:5001/catladder/catladder" || 0;
 
 /***/ }),
@@ -11324,7 +11324,9 @@ exports.RUNNER_IMAGE_BUILD_CONTEXT = {
  */
 const getShippedImagesDir = () => {
   const candidates = [
-  // built package: dist/customImages -> dist/runner-images
+  // built pipeline package: dist/customImages -> dist/runner-images
+  // bundled cli package (what consumers install): the ncc bundles live
+  // in dist/bundles/<name>, so both resolve to dist/bundles/runner-images
   (0, path_1.join)(__dirname, "..", "runner-images"),
   // repository: pipeline/src/customImages -> <root>/runner-images
   (0, path_1.join)(__dirname, "..", "..", "..", "runner-images")];

package/dist/bundles/runner-images/agent-claude/Dockerfile

@@ -0,0 +1,5 @@
+FROM node:24-alpine3.21
+
+RUN apk update && apk add --no-cache git curl bash
+
+RUN npm install -g @anthropic-ai/claude-code@2.1.139 @zereight/mcp-gitlab@2.1.10

package/dist/bundles/runner-images/docker-build/Dockerfile

@@ -0,0 +1,26 @@
+
+FROM docker:29.5.1
+
+# add bash
+RUN apk add --no-cache bash 
+
+# for glcoud
+ARG GCLOUD_SDK_VERSION=525.0.0
+
+RUN apk --update add curl python3 py3-crcmod libc6-compat
+RUN curl -O https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-${GCLOUD_SDK_VERSION}-linux-x86_64.tar.gz && \
+    tar zxvf google-cloud-sdk-${GCLOUD_SDK_VERSION}-linux-x86_64.tar.gz && \
+    rm google-cloud-sdk-${GCLOUD_SDK_VERSION}-linux-x86_64.tar.gz && \
+    ./google-cloud-sdk/install.sh
+ENV PATH="/google-cloud-sdk/bin:${PATH}"
+
+# end gcloud
+
+# for scripts
+
+RUN mkdir p /scripts
+COPY ./scripts/* /scripts/
+RUN chmod +x /scripts/*
+
+ENV PATH="/scripts:${PATH}"
+

package/dist/bundles/runner-images/docker-build/scripts/ensureMeteorDockerfile

@@ -0,0 +1,55 @@
+#!/bin/bash
+
+if [ ! -f $APP_DIR/.dockerignore ]; then
+
+    cat >$APP_DIR/.dockerignore <<EOF
+$APP_DIR/node_modules
+**/__snapshots__/**
+.git
+
+EOF
+fi
+
+if [ ! -f $APP_DIR/Dockerfile ]; then
+    echo "Creating Dockerfile"
+    if [[ ! -z "$METEOR_OVERRIDE_NODE_VERSION" ]]; then
+        NODE_VERSION=$METEOR_OVERRIDE_NODE_VERSION
+    else
+        NODE_VERSION_FULL=$(cat $APP_DIR/dist/bundle/.node_version.txt)
+        NODE_VERSION=${NODE_VERSION_FULL/v/} # remove v
+    fi
+    if [ "$NODE_VERSION" = "14.21.4" ]; then
+        DOCKER_IMAGE="meteor/node:$NODE_VERSION" # meteor maintenance for because of fibers
+    else
+        DOCKER_IMAGE="node:$NODE_VERSION"
+    fi
+    cat >$APP_DIR/Dockerfile <<EOF
+FROM $DOCKER_IMAGE
+
+# install yarn. new meteor image has no yarn installed
+# only install if it does not exist
+RUN command -v yarn || npm install --global yarn
+
+
+$DOCKERFILE_ADDITIONS
+
+# we copy also source code and scripts for commands
+# This is technically not required for meteor, but useful if we have additional scripts 
+WORKDIR /src
+$METEOR_INSTALL_SCRIPTS
+
+
+# copy the bundle
+COPY $APP_DIR/dist /src/dist
+
+# now install meteor deps
+RUN cd /src/dist/bundle/programs/server && npm install
+
+$DOCKERFILE_ADDITIONS_END
+
+WORKDIR /src/dist/bundle
+
+CMD ["node", "main.js"]
+EOF
+
+fi

package/dist/bundles/runner-images/docker-build/scripts/ensureNginxDockerfile

@@ -0,0 +1,85 @@
+#!/bin/bash
+
+# ensure nginx config
+echo "ensureNginxDockerfile in $APP_DIR"
+
+if [ ! -f $APP_DIR/nginx.conf ]; then
+    echo "Creating nginx.conf"
+
+    cat >$APP_DIR/nginx.conf <<NGINX
+    
+server {
+    listen       8080;
+    server_name  localhost;
+    error_page 404 =200 /index.html;
+
+    charset utf-8;
+
+    add_header Strict-Transport-Security "max-age=63072000; includeSubdomains; preload";
+    add_header Referrer-Policy "strict-origin-when-cross-origin";
+    add_header X-Content-Type-Options "nosniff";
+    add_header X-Frame-Options "SAMEORIGIN";
+
+    location / {
+        root   /usr/share/nginx/html;
+        index  index.html index.htm;
+    }
+
+    location /__health {
+        access_log off;
+        types { } default_type "text/html; charset=utf-8";
+        return 200 "ok\n";
+    }
+
+    # https://trac.nginx.org/nginx/ticket/2216
+    include mime.types;
+    types
+    {
+        application/javascript mjs;
+    }
+}
+
+NGINX
+
+fi
+# ensure docker ignore
+if [ ! -f $APP_DIR/.dockerignore ]; then
+
+    cat >.dockerignore <<EOF
+**/node_modules
+**/__snapshots__/**
+.git
+
+EOF
+
+fi
+
+if [ ! -f $APP_DIR/Dockerfile ]; then
+    echo "Creating Dockerfile"
+
+    cat >$APP_DIR/Dockerfile <<EOF
+
+$DOCKERFILE_ADDITIONS
+
+FROM nginx:stable
+WORKDIR /app
+
+RUN sed --in-place "s/^\s*user .*//" /etc/nginx/nginx.conf && \
+    chown -R nginx:nginx /app && \
+    chmod -R 755 /app && \
+    chown -R nginx:nginx /var/cache/nginx && \
+    chown -R nginx:nginx /var/log/nginx && \
+    chown -R nginx:nginx /etc/nginx/conf.d && \
+    touch /var/run/nginx.pid && \
+    chown -R nginx:nginx /var/run/nginx.pid
+
+COPY $APP_DIR/nginx.conf /etc/nginx/conf.d/default.conf
+COPY $APP_DIR/dist/ /usr/share/nginx/html/
+
+$DOCKERFILE_ADDITIONS_END
+
+USER nginx
+EXPOSE 8080
+
+EOF
+fi

package/dist/bundles/runner-images/docker-build/scripts/ensureNodeDockerfile

@@ -0,0 +1,50 @@
+#!/bin/bash
+
+# the default dockerfile includes node alpine
+
+# the dockerignore ignores node_modules as these have to be rebuilt anyway
+# as well as __snapshots__ are used for unitests (if any)
+
+if [ ! -f $APP_DIR/.dockerignore ]; then
+
+    cat >$APP_DIR/.dockerignore <<EOF
+**/node_modules
+**/__snapshots__/**
+.git
+
+EOF
+
+fi
+
+if [ -f $APP_DIR/.nvmrc ]; then
+    NODE_VERSION="$(cat $APP_DIR/.nvmrc | sed '/^$/d' | sed 's/[a-z-]//g')"
+elif [ -f .nvmrc ]; then
+    NODE_VERSION="$(cat .nvmrc | sed '/^$/d' | sed 's/[a-z-]//g')"
+else
+    NODE_VERSION=14
+fi
+
+if [ ! -f $APP_DIR/Dockerfile ]; then
+    echo "Creating Dockerfile"
+
+    cat >$APP_DIR/Dockerfile <<EOF
+FROM node:$NODE_VERSION-alpine
+
+
+
+$DOCKERFILE_ADDITIONS
+
+RUN apk add --no-cache git curl
+USER node
+
+$DOCKER_COPY_WORKSPACE_FILES
+
+WORKDIR /app/$APP_DIR
+
+$DOCKER_COPY_AND_INSTALL_APP
+
+
+$DOCKERFILE_ADDITIONS_END
+
+EOF
+fi

package/dist/bundles/runner-images/gcloud/Dockerfile

@@ -0,0 +1,3 @@
+
+FROM google/cloud-sdk:latest
+

package/dist/bundles/runner-images/jobs-default/Dockerfile

@@ -0,0 +1,22 @@
+
+
+FROM node:18
+
+RUN rm /bin/sh && \
+    ln -s /bin/bash /bin/sh && \
+    mkdir -p /root/.nvm
+
+# set high timeout for yarn, see https://github.com/dhis2/notes/issues/29
+RUN yarn config set network-timeout 600000 -g
+
+# install nvm && some common node versions
+RUN curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.40.1/install.sh | bash && \
+    source /root/.nvm/nvm.sh && \
+    chmod +x /root/.nvm/nvm.sh && \
+    /root/.nvm/nvm.sh install 12 && \
+    /root/.nvm/nvm.sh install 14 && \
+    /root/.nvm/nvm.sh install 16 && \
+    /root/.nvm/nvm.sh install 18 && \
+    /root/.nvm/nvm.sh install 20 && \
+    /root/.nvm/nvm.sh install 22 && \
+    /root/.nvm/nvm.sh install 24

package/dist/bundles/runner-images/jobs-meteor/Dockerfile

@@ -0,0 +1,7 @@
+# syntax = docker.io/devthefuture/dockerfile-x
+
+
+INCLUDE ./jobs-default/Dockerfile
+
+# add meteor (used by some apps)
+RUN curl https://install.meteor.com/?release=2.13.3 | sh

package/dist/bundles/runner-images/jobs-testing-chrome/Dockerfile

@@ -0,0 +1,15 @@
+# syntax = docker.io/devthefuture/dockerfile-x
+
+INCLUDE ./jobs-default/Dockerfile
+
+# add sources
+# Google Chrome (for testing purposes)
+RUN wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add - && \
+    sh -c 'echo "deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main" >> /etc/apt/sources.list.d/google.list'
+
+# install some sources
+# not sure if libxss1 is required
+RUN apt-get update && apt-get install -y \
+    libxss1 \ 
+    google-chrome-stable
+

package/dist/bundles/runner-images/kubernetes/Dockerfile

@@ -0,0 +1,26 @@
+
+FROM alpine:3.15
+
+# add bash curl and git
+RUN apk add --no-cache bash curl git
+
+
+# kubernetes & helm
+ENV KUBERNETES_VERSION 1.19.14
+RUN curl -L -o /usr/bin/kubectl "https://storage.googleapis.com/kubernetes-release/release/v${KUBERNETES_VERSION}/bin/linux/amd64/kubectl" ;\
+    chmod +x /usr/bin/kubectl ;\
+    kubectl version --client
+
+#  helm 3
+ENV HELM_VERSION 3.10.0
+RUN curl "https://get.helm.sh/helm-v${HELM_VERSION}-linux-amd64.tar.gz" | tar zx ;\
+    mv linux-amd64/helm /usr/bin/helm ;\
+    helm version --client
+
+
+COPY ./scripts/* /scripts/
+RUN chmod +x /scripts/*
+
+ENV PATH="/scripts:${PATH}"
+
+COPY ./helm-charts /helm-charts

package/dist/bundles/runner-images/kubernetes/helm-charts/the-panter-chart/Chart.lock

@@ -0,0 +1,9 @@
+dependencies:
+- name: mongodb
+  repository: https://charts.bitnami.com/bitnami
+  version: 12.1.27
+- name: mailhog
+  repository: https://codecentric.github.io/helm-charts
+  version: 5.0.1
+digest: sha256:8963e4182d88c519cf73b6c1e18f9993827b7bf7b54432f56b7b8c5d758bcf8e
+generated: "2022-07-25T19:15:40.334548+02:00"

package/dist/bundles/runner-images/kubernetes/helm-charts/the-panter-chart/Chart.yaml

@@ -0,0 +1,14 @@
+apiVersion: v2
+description: a chart to rule them all
+name: the-panter-chart
+version: 1.0.0 # should not matter
+
+dependencies:
+  - name: mongodb
+    version: 12.1.27
+    condition: mongodb.enabled
+    repository: https://charts.bitnami.com/bitnami
+  - name: mailhog
+    version: 5.0.1
+    condition: mailhog.enabled
+    repository: https://codecentric.github.io/helm-charts

package/dist/bundles/runner-images/kubernetes/helm-charts/the-panter-chart/README.md

@@ -0,0 +1,24 @@
+# The panter chart
+
+**Main chart used in https://git.panter.ch/catladder/gitlab-ci/ **
+
+Developing helm charts can be complex and they tend to be very verbose.
+Our goal is therefore to provide a common chart that provides all functionalities that you might need
+and make it configurable by values.yml files in your project.
+
+This way we avoid having complexity in the projects and make it easier to share innovations and improvements.
+
+## Features
+
+- scalable stateless webapplications, supports any technology
+- ready-to-use but configurable ingress with optional redirects
+- 1 optional worker pod (uses same image as webapp) for continuous background jobs
+- configurable cronjobs
+- configurable helm-hooks (post-install, post-uninstall, etc.)
+- optional in-namespace mongodb. _kindof deprecated, We recommend to use google cloud dbs if possible._
+- optional cloud-sql proxy that is available in webapp, worker, cronjobs and helm-hooks
+- a lot of useful predefined env-vars in all pods.
+- support for namespace secrets and custom env-vars (using catladder-shell and gitlab-ci)
+- optional prisam1 (_deprecated, prisma2 does not need a separate instance anymore_)
+
+See https://git.panter.ch/catladder/catladder/ for usage information

package/dist/bundles/runner-images/kubernetes/helm-charts/the-panter-chart/myvalues.yaml

@@ -0,0 +1,15 @@
+application:
+  command: main foo.js
+
+env:
+  public:
+    FOO: bar
+  fromComponents:
+    api:
+      API_URL: ROOT_URL
+
+cloudsql:
+  enabled: true
+
+mailhog:
+  enabled: true

package/dist/bundles/runner-images/kubernetes/helm-charts/the-panter-chart/templates/_helpers.tpl

@@ -0,0 +1,202 @@
+{{/* vim: set filetype=mustache: */}}
+{{/*
+Expand the name of the chart.
+*/}}
+{{- define "name" -}}
+{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+
+{{- define "appImage" -}}
+  {{ .Values.image.repository }}/{{ .Values.image.name }}:{{ .Values.image.tag }}
+{{- end -}}
+
+
+{{/*
+Create a default fully qualified app name.
+We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
+*/}}
+{{- define "fullname" -}}
+{{- default .Release.Name .Values.global.appName | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+
+
+{{/*
+create a prefix for variable names, this is useful in service discovery in review apps
+*/}}
+{{- define "serviceVarPrefix" -}}
+{{ include "fullname" . | snakecase | upper }}
+{{- end -}}
+
+
+{{/*
+Create chart name and version as used by the chart label.
+*/}}
+{{- define "chart" -}}
+{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+
+{{/*
+get the right host
+*/}}
+{{- define "host" -}}
+   {{- default .Values.application.hostCanonical .Values.application.host -}}
+{{- end -}}
+
+{{- define "MAILHOG_SMTP_URL" -}}
+{{- $namespace := .Release.Namespace -}}
+{{- printf "smtp://%s.%s.svc.cluster.local:1025" .Values.mailhog.fullnameOverride $namespace -}}
+{{- end -}}
+
+{{- define "DB_NAME" -}}
+{{ .Values.cloudsql.fullDbName }}
+{{- end -}}
+
+{{- define "POSTGRESQL_URL" -}}
+postgresql://{{ .Values.cloudsql.dbUser }}:$(POSTGRESQL_PASSWORD)@localhost/{{ .Values.cloudsql.fullDbName }}?schema=public
+{{- end -}}
+
+{{- define "POSTGRESQL_HOST" -}}
+localhost
+{{- end -}}
+
+{{- define "DB_USERNAME" -}}
+{{ .Values.cloudsql.dbUser }}
+{{- end -}}
+
+
+{{- define "DB_PASSWORD" -}}
+$(POSTGRESQL_PASSWORD)
+{{- end -}}
+
+
+{{- define "cloudSqlContainer" -}}
+name: cloudsql-proxy
+image: eu.gcr.io/cloud-sql-connectors/cloud-sql-proxy:2.18.0-alpine
+# see https://github.com/kubernetes/kubernetes/issues/25908#issuecomment-308569672
+# and https://github.com/kubernetes/enhancements/tree/master/keps/sig-node/753-sidecar-containers
+command: ["/bin/sh", "-c"]
+args:
+  - |
+    /cloud-sql-proxy --auto-ip --credentials-file /secrets/cloudsql/credentials.json "{{ .Values.cloudsql.instanceConnectionName }}" &
+    CHILD_PID=$!
+    (while true; do if [[ -f "/tmp/pod/main-terminated" ]]; then kill $CHILD_PID; fi; sleep 1; done) &
+    wait $CHILD_PID
+    if [[ -f "/tmp/pod/main-terminated" ]]; then exit 0; fi
+securityContext:
+  runAsUser: 2  # non-root user
+  allowPrivilegeEscalation: false
+resources: # each container needs requests, or the auto load balancer does not work
+  requests:
+    cpu: 50m
+    memory: 150Mi
+volumeMounts:
+  - name: cloudsql-proxy-credentials
+    mountPath: /secrets/cloudsql
+    readOnly: true
+    
+  - mountPath: /tmp/pod
+    name: tmp-pod
+    readOnly: true
+{{- end -}}
+
+{{- define "cloudSqlCredentialsVolume" -}}
+name: cloudsql-proxy-credentials
+secret:
+  secretName: {{ template "fullname" $ }}-cloudsql-proxy-credentials
+{{- end -}}
+{{/*
+Generate prisma-URL
+*/}}
+{{- define "PRISMA_ENDPOINT" -}}
+  {{- $appName := default .Release.Name .Values.global.appName -}}
+  {{- $namespace := .Release.Namespace -}}
+  {{- printf "http://%s-prisma.%s:4466/default/default" $appName $namespace -}}
+{{- end -}}
+
+
+
+
+{{/*
+convert value to json-string if its an object
+*/}}
+{{- define "envValue" -}}
+  {{- if (kindIs "map" .) -}}
+    {{ toJson . | quote}}
+  {{- else -}}
+    {{ quote . }}
+  {{- end -}}
+{{- end -}}
+
+
+{{- define "env" -}}
+{{ $context := . }}
+
+
+
+envFrom:
+  - configMapRef:
+      name: {{ template "fullname" $ }}-app-env
+env: 
+  {{- range $key, $val := .Values.env.secret }}
+  - name: {{ $key }}
+    valueFrom:
+      secretKeyRef:
+        name: {{ template "fullname" $ }}-app-secrets
+        key: {{ $key }}
+  {{- end }}
+
+  {{- range $key, $val := .Values.secretsFromOtherComponent }}
+  
+  - name: {{ $key }}
+    valueFrom:
+      secretKeyRef:
+        name: {{ $.Values.global.appPrefix}}{{ $val }}-app-secrets
+        key: {{ $key }}
+        optional: true
+  {{- end }}
+
+  {{- range $key, $val := .Values.mapServiceUrlToEnv }}
+  {{- $otherServiceFullName := (printf "%s%s" $.Values.global.appPrefix $val) }}
+  {{- $variablePrefix := $otherServiceFullName | snakecase | upper }}
+  - name: {{ $key }}
+    value: "http://$({{ $variablePrefix }}_SERVICE_HOST):$({{ $variablePrefix }}_SERVICE_PORT)"
+  {{- end }}
+
+  # can't have these in app.env.configmap as some values contain  $(OTHER_ENV_VAR)
+  {{ if .Values.cloudsql.enabled }}
+  - name: POSTGRESQL_URL
+    value: "{{- template "POSTGRESQL_URL" . -}}"
+  - name: DATABASE_URL
+    value: "{{- template "POSTGRESQL_URL" . -}}"
+  
+  - name: POSTGRESQL_HOST
+    value: "{{- template "POSTGRESQL_HOST" . -}}"
+  - name: DB_HOST # alias
+    value: "{{- template "POSTGRESQL_HOST" . -}}"
+  - name: DB_NAME 
+    value: "{{- template "DB_NAME" . -}}"
+  - name: DB_USERNAME #alias
+    value: "{{- template "DB_USERNAME" . -}}"
+  - name: DB_PASSWORD #alias
+    value: "{{- template "DB_PASSWORD" . -}}"
+  - name: POSTGRESQL_DBNAME # alias
+    value: "{{- template "DB_NAME" . -}}"
+  {{- end -}}
+ 
+{{- end -}}
+
+
+
+{{- define "visualReviewSnippet" -}}
+  <script
+    data-project-id='{{.Values.gitlab.projectId}}'
+    data-merge-request-id='{{.Values.gitlab.mergeRequestId}}'
+    data-mr-url='https://git.panter.ch'
+    data-project-path='{{.Values.gitlab.projectPath}}'
+    id='review-app-toolbar-script'
+    src='https://git.panter.ch/assets/webpack/visual_review_toolbar.js'>
+  </script>
+{{- end -}}

package/dist/bundles/runner-images/kubernetes/helm-charts/the-panter-chart/templates/app.cloudsql-proxy-credentials.yml

@@ -0,0 +1,10 @@
+{{- if .Values.cloudsql.enabled -}}
+apiVersion: v1
+kind: Secret
+metadata:
+  name: {{ template "fullname" . }}-cloudsql-proxy-credentials
+  labels:
+    app: {{ .Release.Name }}
+data:
+  credentials.json: {{ .Values.cloudsql.proxyCredentials | b64enc}}
+{{- end }}