From e98ad712ade9859bd393450df1da55879c5c5102 Mon Sep 17 00:00:00 2001 From: imontero Date: Thu, 3 Dec 2020 15:26:36 +0000 Subject: [PATCH] 2.263.1.2 --- Dockerfile | 5 +---- Jenkinsfile | 2 +- README.md | 8 ++++---- download.json | 4 ++-- 4 files changed, 8 insertions(+), 11 deletions(-) diff --git a/Dockerfile b/Dockerfile index 86e0589..e4cefbb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -29,10 +29,7 @@ ENTRYPOINT ["entrypoint", "jenkins-agent"] # TODO LABELS ARG TARBALL=files.tar -COPY ${TARBALL} /tmp -RUN cd / && \ - tar xvf /tmp/files.tar && \ - rm /tmp/files.tar +ADD ${TARBALL} / COPY scripts/ / RUN rpm -i /rpms/*.rpm && \ rm -rf /rpms && \ diff --git a/Jenkinsfile b/Jenkinsfile index 03ae711..05c1f6b 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,2 +1,2 @@ @Library('DCCSCR@master') _ -dccscrPipeline(version: '2.249.3.3') +dccscrPipeline(version: '2.263.1.2') diff --git a/README.md b/README.md index e3ab221..2d5baa8 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.249.3.3` +A version of CloudBees CI is given in the format `2.263.1.2` 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.249.3.3 + dockerImage: your-registry/core-oc:2.263.1.2 Master: Image: - dockerImage: your-registry/core-mm:2.249.3.3 + dockerImage: your-registry/core-mm:2.263.1.2 Agents: Image: - dockerImage: your-registry/agent:2.249.3.3 + dockerImage: your-registry/agent:2.263.1.2 ``` 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/download.json b/download.json index 5d053a9..53e6e35 100644 --- a/download.json +++ b/download.json @@ -1,11 +1,11 @@ { "resources": [ { - "url": "https://downloads.cloudbees.com/dsop-files/agent-files-00b57c9078d97ead911133c86a69d2256a6792da44bf4bbcb299e6a6742e7a04.tar", + "url": "https://downloads.cloudbees.com/dsop-files/agent-files-f93f6e8014ad253b32649004fc10febc5f19155cf38ac88f03f3eb4e65d4f734.tar", "filename": "files.tar", "validation": { "type": "sha256", - "value": "00b57c9078d97ead911133c86a69d2256a6792da44bf4bbcb299e6a6742e7a04" + "value": "f93f6e8014ad253b32649004fc10febc5f19155cf38ac88f03f3eb4e65d4f734" } } ] -- GitLab