Merge branch '2.263.1.2' into 'development'

2.263.1.2

See merge request !41

Dockerfile

@@ -41,9 +41,9 @@ ENTRYPOINT ["tini", "--", "/usr/local/bin/launch.sh"]
 HEALTHCHECK --interval=5m --timeout=3s \
   CMD curl -fsL ${JENKINS_URL}/login || exit 1
 
-LABEL securitytxt="https://www.cloudbees.com/.well-known/security.txt"
-LABEL release=39e96b82ab7adf049eac0aacdb3c432f51abaf1b
-LABEL version=2.263.1.2
+# LABEL securitytxt="https://www.cloudbees.com/.well-known/security.txt"
+# LABEL release=3011be3b5ab0e30ea7af04d1194f4d007a795ef5
+# LABEL version=2.263.1.2
 
 ARG TARBALL=files.tar
 ADD ${TARBALL} /
@@ -65,7 +65,7 @@ ENV VOLUME_SERVICE=http://localhost:31080
 ENV TENANT=cjoc
 ENV JENKINS_VARIANT=cjoc
 
-LABEL name="CloudBees CI Operation Center" \
-      vendor="CloudBees, Inc." \
-      summary="CloudBees CI is the continuous delivery platform architected for the enterprise" \
-      description="This container image will deploy one instance of CloudBees CI Operations Center."
+# LABEL name="CloudBees CI Operation Center"
+# LABEL vendor="CloudBees, Inc."
+# LABEL summary="CloudBees CI is the continuous delivery platform architected for the enterprise"
+# LABEL description="This container image will deploy one instance of CloudBees CI Operations Center."

Jenkinsfile

-@Library('DCCSCR@master') _
-dccscrPipeline(version: '2.263.1.2')

download.json

-{
-  "resources": [
-    {
-      "url": "https://downloads.cloudbees.com/dsop-files/core-oc-files-0aefab0f8d3d18886ab7e143939eeec200a193b7de109941346886993646ad14.tar",
-      "filename": "files.tar",
-      "validation": {
-        "type": "sha256",
-        "value": "0aefab0f8d3d18886ab7e143939eeec200a193b7de109941346886993646ad14"
-      }
-    }
-  ]
-}

hardening_manifest.yaml

+apiVersion: v1
+name: cloudbees/core/core-oc
+tags:
+- "2.263.1.2"
+- latest
+labels:
+  org.opencontainers.image.title: core-oc
+  org.opencontainers.image.description: "CloudBees CI (core-oc subcomponent)"
+  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.263.1.2"
+  mil.dso.ironbank.image.keywords: cicd
+  mil.dso.ironbank.image.type: commercial
+  mil.dso.ironbank.product.name: CloudBees CI
+resources:
+- filename: files.tar
+  url: https://downloads.cloudbees.com/dsop-files/core-oc-files-bde4ca940874c9026da7b3cd2ee0e27cd4eccee9ff71e272608c1404882cb231.tar
+  validation:
+    type: sha256
+    value: bde4ca940874c9026da7b3cd2ee0e27cd4eccee9ff71e272608c1404882cb231
+maintainers:
+- email: productivity-team@cloudbees.com

helm/requirements.lock

@@ -8,5 +8,5 @@ dependencies:
 - name: cloudbees-sidecar-injector
   repository: https://charts.cloudbees.com/public/cloudbees
   version: 2.1.0
-digest: sha256:b1cd3367672f5c35bdcff06f4a7d87f072f5f89f4e654a90aa199f3c1b939070
-generated: "2020-12-11T09:39:09.337984855Z"
+digest: sha256:996f7a1d8ae1bb7465e7df2865ef4521e1ebe3e10827d6544caebd4d0c811c23
+generated: "2020-11-02T17:56:50.500073-05:00"

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=39e96b82ab7adf049eac0aacdb3c432f51abaf1b /usr/share/jenkins/jenkins.war $JENKINS_OPTS \"\$@\""
+  eval "exec java ${JAVA_OPTS:-} -jar -Dcb.distributable.name=\"Docker Common CJE\" -Dcb.distributable.commit_sha=3011be3b5ab0e30ea7af04d1194f4d007a795ef5 /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