diff --git a/Dockerfile b/Dockerfile index d78b5234d4b0d942b9f668af29a4566753bfeb66..86e0589d3be00f7a44e61ed1909baa7b07c39177 100644 --- a/Dockerfile +++ b/Dockerfile @@ -34,8 +34,8 @@ RUN cd / && \ tar xvf /tmp/files.tar && \ rm /tmp/files.tar COPY scripts/ / -RUN rpm -i /tmp/rpms/*.rpm && \ - rm -rf /tmp/rpms && \ +RUN rpm -i /rpms/*.rpm && \ + rm -rf /rpms && \ chmod 755 /usr/share/jenkins && \ chmod 644 /usr/share/jenkins/agent.jar && \ chmod a+x /usr/local/bin/* && \ diff --git a/Jenkinsfile b/Jenkinsfile index 1f62f3af87329a41eec00bdbc4358cd472c37441..6cbfdbdd8044f2215c4a432829af8c830dcd7f88 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,2 +1,2 @@ @Library('DCCSCR@master') _ -dccscrPipeline(version: '2.249.1.2') +dccscrPipeline(version: '2.249.2.3') diff --git a/README.md b/README.md index 609be793221d1dc35eba9228397d274cfe611bb4..b2f5ad6b1b78f355900269d9880daddad3ab437e 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.1.2` +A version of CloudBees CI is given in the format `2.249.2.3` 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.1.2 + dockerImage: your-registry/core-oc:2.249.2.3 Master: Image: - dockerImage: your-registry/core-mm:2.249.1.2 + dockerImage: your-registry/core-mm:2.249.2.3 Agents: Image: - dockerImage: your-registry/agent:2.249.1.2 + dockerImage: your-registry/agent:2.249.2.3 ``` 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 626e2e3ba4bc39bee70e321f754da2ad617ad4fc..c8aa404bab12476629171b9642a929bbe63685b4 100644 --- a/download.json +++ b/download.json @@ -1,11 +1,11 @@ { "resources": [ { - "url": "https://downloads.cloudbees.com/dsop-files/agent-files-694d270bc1155dbc62dc709d8df6ba476f4fd13e5fd3b74d177720943cdbb469.tar", + "url": "https://downloads.cloudbees.com/dsop-files/agent-files-805e797f027018844fd4b59eef722fabd7d4b015d2ff4ebd652d1146e00b94cb.tar", "filename": "files.tar", "validation": { "type": "sha256", - "value": "694d270bc1155dbc62dc709d8df6ba476f4fd13e5fd3b74d177720943cdbb469" + "value": "805e797f027018844fd4b59eef722fabd7d4b015d2ff4ebd652d1146e00b94cb" } } ]