From b09213be84b7a7f37558c0f42de40c101ebfd2e6 Mon Sep 17 00:00:00 2001 From: imontero Date: Mon, 5 Jul 2021 10:06:11 +0000 Subject: [PATCH] 2.289.2.2-ra --- Dockerfile | 4 ++-- README.md | 8 ++++---- hardening_manifest.yaml | 8 ++++---- helm/Chart.yaml | 4 ++-- helm/README-template.md | 2 +- helm/README.md | 2 +- helm/templates/_helpers.tpl | 2 ++ helm/values.yaml | 6 +++--- scripts/usr/local/bin/jenkins.sh | 2 +- 9 files changed, 20 insertions(+), 18 deletions(-) diff --git a/Dockerfile b/Dockerfile index 38c858c..b64454a 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=11ffc7effdc3514efdf1e667e56d5e1d8b42e281 -# L-A-B-E-L version=2.289.1.2-ra +# L-A-B-E-L release=c96254800631d0ea4eff5ff0347232e658eaac0b +# L-A-B-E-L version=2.289.2.2-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 6c6eaa6..999819d 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.1.2-ra` +A version of CloudBees CI is given in the format `2.289.2.2-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.1.2-ra + dockerImage: your-registry/core-oc:2.289.2.2-ra Master: Image: - dockerImage: your-registry/core-mm:2.289.1.2-ra + dockerImage: your-registry/core-mm:2.289.2.2-ra Agents: Image: - dockerImage: your-registry/agent:2.289.1.2-ra + dockerImage: your-registry/agent:2.289.2.2-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 2cbc61b..3a14cb8 100644 --- a/hardening_manifest.yaml +++ b/hardening_manifest.yaml @@ -1,7 +1,7 @@ apiVersion: v1 name: "cloudbees/core/core-oc" tags: -- "2.289.1.2-ra" +- "2.289.2.2-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.1.2-ra" + org.opencontainers.image.version: "2.289.2.2-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-48f811b2596bd78374ffcce9fcd75469824bbf466e948c00f92fe133dcb6608a.tar + url: https://downloads.cloudbees.com/dsop-files/core-oc-files-71a113b144f0329c38424fc6836e9ccfda772fff3399c89b5dac485c6c954635.tar validation: type: sha256 - value: "48f811b2596bd78374ffcce9fcd75469824bbf466e948c00f92fe133dcb6608a" + value: "71a113b144f0329c38424fc6836e9ccfda772fff3399c89b5dac485c6c954635" maintainers: - email: productivity-team@cloudbees.com name: CloudBees diff --git a/helm/Chart.yaml b/helm/Chart.yaml index 11c4a5a..0adaf6a 100644 --- a/helm/Chart.yaml +++ b/helm/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v2 name: cloudbees-core -version: 3.32.1 +version: 3.33.0 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.1.2 +appVersion: 2.289.2.2 annotations: artifacthub.io/links: | - name: Product overview diff --git a/helm/README-template.md b/helm/README-template.md index 5fa8c9f..9035955 100644 --- a/helm/README-template.md +++ b/helm/README-template.md @@ -1,6 +1,6 @@ # cloudbees-core -![Version: 3.32.1](https://img.shields.io/badge/Version-3.32.1-informational?style=flat-square) ![AppVersion: 2.289.1.2](https://img.shields.io/badge/AppVersion-2.289.1.2-informational?style=flat-square) +![Version: 3.33.0](https://img.shields.io/badge/Version-3.33.0-informational?style=flat-square) ![AppVersion: 2.289.2.2](https://img.shields.io/badge/AppVersion-2.289.2.2-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 286feba..e66b336 100644 --- a/helm/README.md +++ b/helm/README.md @@ -1,6 +1,6 @@ # cloudbees-core -![Version: 3.32.1](https://img.shields.io/badge/Version-3.32.1-informational?style=flat-square) ![AppVersion: 2.289.1.2](https://img.shields.io/badge/AppVersion-2.289.1.2-informational?style=flat-square) +![Version: 3.33.0](https://img.shields.io/badge/Version-3.33.0-informational?style=flat-square) ![AppVersion: 2.289.2.2](https://img.shields.io/badge/AppVersion-2.289.2.2-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 6131c48..336051b 100644 --- a/helm/templates/_helpers.tpl +++ b/helm/templates/_helpers.tpl @@ -157,8 +157,10 @@ Expected Operations Center Hostname. Include port if not 80/443. {{- if (include "cloudbees-core.use-subdomain" .) -}} {{- include "oc.name" . -}}. {{- end -}} +{{- if kindIs "string" .Values.OperationsCenter.HostName -}} {{ .Values.OperationsCenter.HostName }} {{- end -}} +{{- end -}} {{/* Expected Operations Center Hostname. Include port if not 80/443. diff --git a/helm/values.yaml b/helm/values.yaml index 3c62a0f..ea31f18 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.1.2-ra + dockerImage: dcar/core-oc:2.289.2.2-ra # OperationsCenter.Image.dockerPullPolicy -- https://kubernetes.io/docs/concepts/containers/images/#updating-images dockerPullPolicy: null @@ -262,7 +262,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.1.2-ra + dockerImage: dcar/core-mm:2.289.2.2-ra # Master.JavaOpts -- Additional Java options to pass to managed masters. For example, setting up a JMX port JavaOpts: null @@ -279,7 +279,7 @@ Agents: Create: false Image: # Agents.Image.dockerImage -- Used to override the default docker image used for agents - dockerImage: dcar/agent:2.289.1.2-ra + dockerImage: dcar/agent:2.289.2.2-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 fef3896..96864fe 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=11ffc7effdc3514efdf1e667e56d5e1d8b42e281 /usr/share/jenkins/jenkins.war $JENKINS_OPTS \"\$@\"" + eval "exec java ${JAVA_OPTS:-} -jar -Dcb.distributable.name=\"Docker Common CJE\" -Dcb.distributable.commit_sha=c96254800631d0ea4eff5ff0347232e658eaac0b /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 -- GitLab