diff --git a/Dockerfile b/Dockerfile index 0381cde87897b39a200b96c6a7d4a980edf7bb85..5649bb35e4c4425bb79b3dea1e2978f9abafd551 100644 --- a/Dockerfile +++ b/Dockerfile @@ -26,8 +26,8 @@ WORKDIR /home/${user} ENTRYPOINT ["entrypoint", "jenkins-agent"] -ARG TARBALL=files.tar -ADD ${TARBALL} / +COPY files.tar /tmp +RUN cd / && tar xvf /tmp/files.tar && rm /tmp/files.tar COPY scripts/ / RUN rpm -i /rpms/*.rpm && \ rm -rf /rpms && \ diff --git a/README.md b/README.md index 2d5baa8f3766439f2229b68752065e8573860b41..b77c12bfc1af6e01f3d56c5be66866280e894325 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,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.263.1.2` +A version of CloudBees CI is given in the format `2.263.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, @@ -22,13 +22,13 @@ plus whatever other customizations are desired: ```yaml OperationsCenter: Image: - dockerImage: your-registry/core-oc:2.263.1.2 + dockerImage: your-registry/core-oc:2.263.2.4-ra Master: Image: - dockerImage: your-registry/core-mm:2.263.1.2 + dockerImage: your-registry/core-mm:2.263.2.4-ra Agents: Image: - dockerImage: your-registry/agent:2.263.1.2 + dockerImage: your-registry/agent:2.263.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 93da2da6b3608054925b6818f011ba3396268e4e..062671b575513877a48a710f1cd52b765744681e 100644 --- a/hardening_manifest.yaml +++ b/hardening_manifest.yaml @@ -1,23 +1,27 @@ apiVersion: v1 name: cloudbees/core/agent tags: -- "2.263.1.2" +- "2.263.2.4-ra" - latest labels: - org.opencontainers.image.title: agent + org.opencontainers.image.title: "agent" org.opencontainers.image.description: "CloudBees CI (agent 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" + org.opencontainers.image.version: "2.263.2.4-ra" mil.dso.ironbank.image.keywords: cicd mil.dso.ironbank.image.type: commercial mil.dso.ironbank.product.name: CloudBees CI +args: + BASE_IMAGE: "redhat/openjdk/openjdk8" + BASE_TAG: "1.8.0" resources: - filename: files.tar - url: https://downloads.cloudbees.com/dsop-files/agent-files-0f282fe59508b7acdcafd1b49ec9a768fb2428c88f7824096965eb748ce3642b.tar + url: https://downloads.cloudbees.com/dsop-files/agent-files-cc9d1052834f6b3cd943436374dd7081273d0f46e5ec8931974cb716fa004952.tar validation: type: sha256 - value: 0f282fe59508b7acdcafd1b49ec9a768fb2428c88f7824096965eb748ce3642b + value: "cc9d1052834f6b3cd943436374dd7081273d0f46e5ec8931974cb716fa004952" maintainers: - email: productivity-team@cloudbees.com +- email: andre.maksymowicz@centauricorp.com