diff --git a/Dockerfile b/Dockerfile index c40f3bc7d3a8b5e98f9bcc5ad3e1a06b66eaa161..e3955b9aafae902638f8d269427067fd0dadfa8b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -42,8 +42,8 @@ HEALTHCHECK --interval=5m --timeout=3s \ CMD curl -fsL ${JENKINS_URL}/login || exit 1 # L-A-B-E-L securitytxt="https://www.cloudbees.com/.well-known/security.txt" -# L-A-B-E-L release=fcdc87a35cf67052d4222b11ced2e6c42678402d -# L-A-B-E-L version=2.289.3.2-ra +# L-A-B-E-L release=3863959c0bd62675775ce44634a8334bd6acb477 +# L-A-B-E-L version=2.303.1.6-ra COPY files.tar /tmp RUN cd / && tar xvf /tmp/files.tar && rm /tmp/files.tar diff --git a/README.md b/README.md index fc56bca9dea6e57aea51a1c2c1c10b0ae07ba38b..c8e6c2eeb7c65ea2954c1214bdbaa04c6dc12d1c 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ CloudBees CI (formerly known as _CloudBees Core_) consists of three Docker image For each image, all files other than UBI and native packages are included in a `files.tar` marked with a SHA-256 checksum. -A version of CloudBees CI is given in the format `2.289.3.2-ra` +A version of CloudBees CI is given in the format `2.303.1.6-ra` where the first three components are aligned with a Jenkins LTS. The Helm chart is coversioned with `core-oc`. The `core-mm` image typically shares the same version, @@ -25,13 +25,13 @@ plus whatever other customizations are desired: ```yaml OperationsCenter: Image: - dockerImage: your-registry/core-oc:2.289.3.2-ra + dockerImage: your-registry/core-oc:2.303.1.6-ra Master: Image: - dockerImage: your-registry/core-mm:2.289.3.2-ra + dockerImage: your-registry/core-mm:2.303.1.6-ra Agents: Image: - dockerImage: your-registry/agent:2.289.3.2-ra + dockerImage: your-registry/agent:2.303.1.6-ra ``` and [install via Helm 3](https://docs.cloudbees.com/docs/cloudbees-core/latest/kubernetes-install-guide/installing-kubernetes-using-helm) using the local copy of the chart: diff --git a/hardening_manifest.yaml b/hardening_manifest.yaml index 2efd661ae5d21f79710fc350e74aa961dc3069fb..e89c5f41b117ce63583e77e429a16cc3b0ca24b3 100644 --- a/hardening_manifest.yaml +++ b/hardening_manifest.yaml @@ -1,7 +1,7 @@ apiVersion: v1 name: "cloudbees/core/core-oc" tags: -- "2.289.3.2-ra" +- "2.303.1.6-ra" - latest labels: org.opencontainers.image.title: "core-oc" @@ -9,7 +9,7 @@ labels: org.opencontainers.image.licenses: proprietary org.opencontainers.image.url: https://docs.cloudbees.com/docs/cloudbees-ci/ org.opencontainers.image.vendor: CloudBees - org.opencontainers.image.version: "2.289.3.2-ra" + org.opencontainers.image.version: "2.303.1.6-ra" mil.dso.ironbank.image.keywords: cicd mil.dso.ironbank.image.type: commercial mil.dso.ironbank.product.name: CloudBees CI @@ -18,10 +18,10 @@ args: BASE_TAG: "1.8.0" resources: - filename: files.tar - url: https://downloads.cloudbees.com/dsop-files/core-oc-files-2d243c95029bbdfeb19081775dfce57e6a82d3f54fd564bce07485ff6c7ec846.tar + url: https://downloads.cloudbees.com/dsop-files/core-oc-files-4c52e4441f59653d386f12464764e2a3acff8f823b6050cfd1c37f4d164e7b67.tar validation: type: sha256 - value: "2d243c95029bbdfeb19081775dfce57e6a82d3f54fd564bce07485ff6c7ec846" + value: "4c52e4441f59653d386f12464764e2a3acff8f823b6050cfd1c37f4d164e7b67" maintainers: - email: productivity-team@cloudbees.com name: CloudBees diff --git a/helm/Chart.yaml b/helm/Chart.yaml index 569e979cefce4b871fcf20ff34b5f44679342b63..939d8bfa6cc001e82d7278db4c0b10b5c0e564d6 100644 --- a/helm/Chart.yaml +++ b/helm/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v2 name: cloudbees-core -version: 3.34.1 +version: 3.35.4 description: Enterprise Continuous Integration with Jenkins keywords: - cloudbees @@ -20,7 +20,7 @@ dependencies: repository: https://charts.cloudbees.com/public/cloudbees condition: sidecarinjector.Enabled icon: https://images.ctfassets.net/vtn4rfaw6n2j/7xprMMXARXDBuVxW4y8XfV/349fff91035050e3f2a8ff37bc0615b5/cloudbees-core-logo_header.svg -appVersion: 2.289.3.2 +appVersion: 2.303.1.6 annotations: artifacthub.io/links: | - name: Product overview diff --git a/helm/README-template.md b/helm/README-template.md index fce31b49a241a78f6e02b1aae80137e732b027c0..91b3ec070ed6f206bbb62aac4f983a9b4bc254fd 100644 --- a/helm/README-template.md +++ b/helm/README-template.md @@ -1,6 +1,6 @@ # cloudbees-core -![Version: 3.34.1](https://img.shields.io/badge/Version-3.34.1-informational?style=flat-square) ![AppVersion: 2.289.3.2](https://img.shields.io/badge/AppVersion-2.289.3.2-informational?style=flat-square) +![Version: 3.35.4](https://img.shields.io/badge/Version-3.35.4-informational?style=flat-square) ![AppVersion: 2.303.1.6](https://img.shields.io/badge/AppVersion-2.303.1.6-informational?style=flat-square) [CloudBees CI](https://www.cloudbees.com/products/continuous-integration) is the continuous integration platform architected for the enterprise. It provides: diff --git a/helm/README.md b/helm/README.md index fb686d3c660b91a385302dd35d15ff1d9452ddd4..1cb43e4d9cd73cf14bb21656752e9d679d0d4aeb 100644 --- a/helm/README.md +++ b/helm/README.md @@ -1,6 +1,6 @@ # cloudbees-core -![Version: 3.34.1](https://img.shields.io/badge/Version-3.34.1-informational?style=flat-square) ![AppVersion: 2.289.3.2](https://img.shields.io/badge/AppVersion-2.289.3.2-informational?style=flat-square) +![Version: 3.35.4](https://img.shields.io/badge/Version-3.35.4-informational?style=flat-square) ![AppVersion: 2.303.1.6](https://img.shields.io/badge/AppVersion-2.303.1.6-informational?style=flat-square) [CloudBees CI](https://www.cloudbees.com/products/continuous-integration) is the continuous integration platform architected for the enterprise. It provides: diff --git a/helm/templates/_helpers.tpl b/helm/templates/_helpers.tpl index 336051bc11f11987d246fdcff9e7eae17f8bd71c..43fe367b3ab53e05a92e76dfb011cb03b32df537 100644 --- a/helm/templates/_helpers.tpl +++ b/helm/templates/_helpers.tpl @@ -493,8 +493,11 @@ jmx {{- end -}} {{- define "persistence.storageclass" -}} -{{- if .Values.Persistence.StorageClass -}} +{{/* Separate if blocks because go template doesn't evaluate 'and' clause lazily */}} +{{- if typeIs "string" .Values.Persistence.StorageClass -}} +{{- if ne "-" .Values.Persistence.StorageClass -}} {{ .Values.Persistence.StorageClass}} +{{- end -}} {{- else if (include "gke.storageclass.name" .) -}} {{ include "gke.storageclass.name" . }} {{- else if (include "aks.storageclass.name" .) -}} diff --git a/helm/templates/cjoc-statefulset.yaml b/helm/templates/cjoc-statefulset.yaml index 23f7af318c317c4b1deb37f9f150ccc152f0714b..147bcb6ff0614877478a122948d3c15988462f08 100644 --- a/helm/templates/cjoc-statefulset.yaml +++ b/helm/templates/cjoc-statefulset.yaml @@ -265,7 +265,7 @@ spec: resources: requests: storage: {{ .Values.Persistence.Size | quote }} -{{- if (include "persistence.storageclass" .) }} +{{- if or (typeIs "string" .Values.Persistence.StorageClass) (include "persistence.storageclass" .) }} storageClassName: {{ include "persistence.storageclass" . | quote }} {{- end -}} {{- end -}} diff --git a/helm/values.yaml b/helm/values.yaml index 5abfae73adfc36c54316def20206ad9bac1adfa4..47a34af7bbe75cff5ea31aaf2afcf0ff9c566349 100644 --- a/helm/values.yaml +++ b/helm/values.yaml @@ -57,7 +57,7 @@ OperationsCenter: # Operations Center docker image Image: # OperationsCenter.Image.dockerImage -- Container image to use for Operations Center - dockerImage: dcar/core-oc:2.289.3.2-ra + dockerImage: dcar/core-oc:2.303.1.6-ra # OperationsCenter.Image.dockerPullPolicy -- https://kubernetes.io/docs/concepts/containers/images/#updating-images dockerPullPolicy: null @@ -272,7 +272,7 @@ Master: # Docker image inserted in Operations Center automatically Image: # Master.Image.dockerImage -- Used to override the default docker image - dockerImage: dcar/core-mm:2.289.3.2-ra + dockerImage: dcar/core-mm:2.303.1.6-ra # Master.JavaOpts -- Additional Java options to pass to managed masters. For example, setting up a JMX port JavaOpts: null @@ -289,7 +289,7 @@ Agents: Create: false Image: # Agents.Image.dockerImage -- Used to override the default docker image used for agents - dockerImage: dcar/agent:2.289.3.2-ra + dockerImage: dcar/agent:2.303.1.6-ra # Image pull secrets # Enable this option when using a private registry. # https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/#create-a-secret-by-providing-credentials-on-the-command-line diff --git a/scripts/usr/local/bin/jenkins.sh b/scripts/usr/local/bin/jenkins.sh index 21d8c25f2ea43c31f7e618d43ab0c9222596fc9e..f64c26176ae580dd1f6e0a57829b125699c29576 100644 --- a/scripts/usr/local/bin/jenkins.sh +++ b/scripts/usr/local/bin/jenkins.sh @@ -52,7 +52,7 @@ find /usr/share/jenkins/ref/ -type f -exec bash -c "copy_reference_file '{}'" \; # if `docker run` first argument start with `--` the user is passing jenkins launcher arguments if [[ $# -lt 1 ]] || [[ "$1" == "--"* ]]; then - eval "exec java ${JAVA_OPTS:-} -jar -Dcb.distributable.name=\"Docker Common CJE\" -Dcb.distributable.commit_sha=fcdc87a35cf67052d4222b11ced2e6c42678402d /usr/share/jenkins/jenkins.war $JENKINS_OPTS \"\$@\"" + eval "exec java ${JAVA_OPTS:-} -jar -Dcb.distributable.name=\"Docker Common CJE\" -Dcb.distributable.commit_sha=3863959c0bd62675775ce44634a8334bd6acb477 /usr/share/jenkins/jenkins.war $JENKINS_OPTS \"\$@\"" fi # As argument is not jenkins, assume user want to run his own process, for sample a `bash` shell to explore this image