diff --git a/Dockerfile b/Dockerfile index 0e7f94a9c06200a48f5044048bb4d17571e0418b..52350ac08e065d82272c3945ed129094bcabc59b 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=308768c9f176b5155dd19ff01ca06396b66f5afd -# L-A-B-E-L version=2.277.2.1-ra +# L-A-B-E-L release=d7b584f951ddf7ecf2a3d0cbee88bd6490514658 +# L-A-B-E-L version=2.277.2.4-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 cc4dd791c2b5a84bef82846906138ed0809ff5b0..150b5605efd9144310a8cc3be18af784e5646c1a 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.277.2.1-ra` +A version of CloudBees CI is given in the format `2.277.2.4-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.277.2.1-ra + dockerImage: your-registry/core-oc:2.277.2.4-ra Master: Image: - dockerImage: your-registry/core-mm:2.277.2.1-ra + dockerImage: your-registry/core-mm:2.277.2.4-ra Agents: Image: - dockerImage: your-registry/agent:2.277.2.1-ra + dockerImage: your-registry/agent:2.277.2.4-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 5fe8b0dbea56167489ac0b29c95a0b99b5cf50b2..3d6fb5d0d7a3996849243820409a63dcc3d63c3a 100644 --- a/hardening_manifest.yaml +++ b/hardening_manifest.yaml @@ -1,7 +1,7 @@ apiVersion: v1 name: "cloudbees/core/core-oc" tags: -- "2.277.2.1-ra" +- "2.277.2.4-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.277.2.1-ra" + org.opencontainers.image.version: "2.277.2.4-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-a8c75c110388343781c00894fcade262363681eb914929bf19c94be5195463a3.tar + url: https://downloads.cloudbees.com/dsop-files/core-oc-files-a96da487a77eefa32dd8149d9cc9e274542b1a4e5754e33fa5333fa87cefd9fe.tar validation: type: sha256 - value: "a8c75c110388343781c00894fcade262363681eb914929bf19c94be5195463a3" + value: "a96da487a77eefa32dd8149d9cc9e274542b1a4e5754e33fa5333fa87cefd9fe" maintainers: - email: productivity-team@cloudbees.com name: CloudBees diff --git a/helm/values.yaml b/helm/values.yaml index 3725e7bd95ca9a6756c4b0aa0f857d503127395b..875b15c1619bd1793e483ad3db1b9a43045c57a9 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.277.2.1-ra + dockerImage: dcar/core-oc:2.277.2.4-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.277.2.1-ra + dockerImage: dcar/core-mm:2.277.2.4-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.277.2.1-ra + dockerImage: dcar/agent:2.277.2.4-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 3b94c876846252c0a0830460f65f2754f3439f99..93eb258c945236782edf2eb8ef0156758f8124e8 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=308768c9f176b5155dd19ff01ca06396b66f5afd /usr/share/jenkins/jenkins.war $JENKINS_OPTS \"\$@\"" + eval "exec java ${JAVA_OPTS:-} -jar -Dcb.distributable.name=\"Docker Common CJE\" -Dcb.distributable.commit_sha=d7b584f951ddf7ecf2a3d0cbee88bd6490514658 /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