From 4755eaed7056199eff2f273bb77e4e8d109f96f7 Mon Sep 17 00:00:00 2001 From: gabemontero Date: Fri, 21 Jun 2019 09:51:21 -0400 Subject: [PATCH] fix up some 4.x text around tags; add quick brief on the 4.x image payload --- README.md | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 457c8ae9b..2ae84ebae 100644 --- a/README.md +++ b/README.md @@ -102,10 +102,12 @@ Installation (OpenShift V4) --------------------------------- Starting with v4.0, the images are only available on quay.io for public community support. Their pull specs are: -* quay.io/openshift/origin-jenkins:v4.0 -* quay.io/openshift/origin-jenkins-agent-nodejs:v4.0 -* quay.io/openshift/origin-jenkins-agent-maven:v4.0 -* quay.io/openshift/origin-jenkins-agent-base:v4.0 +* quay.io/openshift/origin-jenkins: +* quay.io/openshift/origin-jenkins-agent-nodejs: +* quay.io/openshift/origin-jenkins-agent-maven: +* quay.io/openshift/origin-jenkins-agent-base: + +Visit quay.io to discover the set of tags for each image. For example, for the core jenkins image, the tags are [here](https://quay.io/repository/openshift/origin-jenkins?tab=tags) The images are also still available at the Red Hat Container Catalog for customers with subscriptions, though with some changes in the naming. @@ -114,10 +116,10 @@ As with the initial introduction in 3.11, given the [transitioning of the Red Ha The terms based registry, registry.redhat.io, which requires credentials for access, is the strategic direction, and will be the only location for RHEL8 based content when that is available. The pull secret you obtain from try.openshift.com includes access to registry.redhat.io. The image pull specs are: -* registry.redhat.io/openshift4/ose-jenkins:v4.0 -* registry.redhat.io/openshift4/ose-jenkins-agent-nodejs:v4.0 -* registry.redhat.io/openshift4/ose-jenkins-agent-maven:v4.0 -* registry.redhat.io/openshift4/ose-jenkins-agent-base:v4.0 +* registry.redhat.io/openshift4/ose-jenkins: +* registry.redhat.io/openshift4/ose-jenkins-agent-nodejs: +* registry.redhat.io/openshift4/ose-jenkins-agent-maven: +* registry.redhat.io/openshift4/ose-jenkins-agent-base: OpenShift v4 also removes the 32 bit JVM option. Only 64 bit will be provided for all images. @@ -127,6 +129,8 @@ With any local builds, if for example you plan on submitting a PR to this reposi Be aware, no support in any way is provided for running images created from any of the `Dockerfile.localdev` files. And in fact the images hosted on both quay.io and the Red Hat Container Catalog are based off the `Dockerfile.rhel7` files. +And lastly, as part of 4.x cluster installs, the OpenShift Jenkins image version corresponding to the cluster version is part of the image payload for the install. So the `jenkins` ImageStream in the `openshift` namespace will have image references that point to the image registry associated with your install instead of these public registries noted above. There is also an ImageStream for each of the agent images in the `openshift` namespace in 4.x installs. + Startup notes for the Jenkins core image ---------------------------------