From 3a61a59451c4f8a5427d44ba7e103fc6dda77894 Mon Sep 17 00:00:00 2001 From: Jonathan Dowland Date: Tue, 13 May 2025 14:35:51 +0100 Subject: [PATCH 1/2] [OPENJDK-3840] Move redhat config to osbs-built base images Signed-off-by: Jonathan Dowland --- redhat/ubi8-openjdk-11-runtime.yaml | 4 ++++ redhat/ubi8-openjdk-11.yaml | 4 ++++ redhat/ubi8-openjdk-17-runtime.yaml | 4 ++++ redhat/ubi8-openjdk-17.yaml | 4 ++++ redhat/ubi8-openjdk-21-runtime.yaml | 4 ++++ redhat/ubi8-openjdk-21.yaml | 4 ++++ redhat/ubi8-openjdk-8-runtime.yaml | 4 ++++ redhat/ubi8-openjdk-8.yaml | 4 ++++ 8 files changed, 32 insertions(+) diff --git a/redhat/ubi8-openjdk-11-runtime.yaml b/redhat/ubi8-openjdk-11-runtime.yaml index c2083d10..360c1776 100644 --- a/redhat/ubi8-openjdk-11-runtime.yaml +++ b/redhat/ubi8-openjdk-11-runtime.yaml @@ -1,3 +1,7 @@ +# This OSBS Base Image is designed and engineered to be the base layer for +# Red Hat products. This base image is only supported for approved Red Hat +# products. This image is maintained by Red Hat and updated regularly. +from: registry.redhat.io/rhel8-osbs/osbs-ubi8-minimal osbs: configuration: container: diff --git a/redhat/ubi8-openjdk-11.yaml b/redhat/ubi8-openjdk-11.yaml index 2804f9a1..125420b6 100644 --- a/redhat/ubi8-openjdk-11.yaml +++ b/redhat/ubi8-openjdk-11.yaml @@ -1,3 +1,7 @@ +# This OSBS Base Image is designed and engineered to be the base layer for +# Red Hat products. This base image is only supported for approved Red Hat +# products. This image is maintained by Red Hat and updated regularly. +from: registry.redhat.io/rhel8-osbs/osbs-ubi8-minimal osbs: configuration: container: diff --git a/redhat/ubi8-openjdk-17-runtime.yaml b/redhat/ubi8-openjdk-17-runtime.yaml index 6e711297..5e21846d 100644 --- a/redhat/ubi8-openjdk-17-runtime.yaml +++ b/redhat/ubi8-openjdk-17-runtime.yaml @@ -1,3 +1,7 @@ +# This OSBS Base Image is designed and engineered to be the base layer for +# Red Hat products. This base image is only supported for approved Red Hat +# products. This image is maintained by Red Hat and updated regularly. +from: registry.redhat.io/rhel8-osbs/osbs-ubi8-minimal osbs: configuration: container: diff --git a/redhat/ubi8-openjdk-17.yaml b/redhat/ubi8-openjdk-17.yaml index afeaa3d7..e373c713 100644 --- a/redhat/ubi8-openjdk-17.yaml +++ b/redhat/ubi8-openjdk-17.yaml @@ -1,3 +1,7 @@ +# This OSBS Base Image is designed and engineered to be the base layer for +# Red Hat products. This base image is only supported for approved Red Hat +# products. This image is maintained by Red Hat and updated regularly. +from: registry.redhat.io/rhel8-osbs/osbs-ubi8-minimal osbs: configuration: container: diff --git a/redhat/ubi8-openjdk-21-runtime.yaml b/redhat/ubi8-openjdk-21-runtime.yaml index 70d55802..dc71f891 100644 --- a/redhat/ubi8-openjdk-21-runtime.yaml +++ b/redhat/ubi8-openjdk-21-runtime.yaml @@ -1,3 +1,7 @@ +# This OSBS Base Image is designed and engineered to be the base layer for +# Red Hat products. This base image is only supported for approved Red Hat +# products. This image is maintained by Red Hat and updated regularly. +from: registry.redhat.io/rhel8-osbs/osbs-ubi8-minimal osbs: configuration: container: diff --git a/redhat/ubi8-openjdk-21.yaml b/redhat/ubi8-openjdk-21.yaml index 942bcbe1..a106f07c 100644 --- a/redhat/ubi8-openjdk-21.yaml +++ b/redhat/ubi8-openjdk-21.yaml @@ -1,3 +1,7 @@ +# This OSBS Base Image is designed and engineered to be the base layer for +# Red Hat products. This base image is only supported for approved Red Hat +# products. This image is maintained by Red Hat and updated regularly. +from: registry.redhat.io/rhel8-osbs/osbs-ubi8-minimal osbs: configuration: container: diff --git a/redhat/ubi8-openjdk-8-runtime.yaml b/redhat/ubi8-openjdk-8-runtime.yaml index 16477e16..85861502 100644 --- a/redhat/ubi8-openjdk-8-runtime.yaml +++ b/redhat/ubi8-openjdk-8-runtime.yaml @@ -1,3 +1,7 @@ +# This OSBS Base Image is designed and engineered to be the base layer for +# Red Hat products. This base image is only supported for approved Red Hat +# products. This image is maintained by Red Hat and updated regularly. +from: registry.redhat.io/rhel8-osbs/osbs-ubi8-minimal osbs: configuration: container: diff --git a/redhat/ubi8-openjdk-8.yaml b/redhat/ubi8-openjdk-8.yaml index 6fc0b8c2..421c2aea 100644 --- a/redhat/ubi8-openjdk-8.yaml +++ b/redhat/ubi8-openjdk-8.yaml @@ -1,3 +1,7 @@ +# This OSBS Base Image is designed and engineered to be the base layer for +# Red Hat products. This base image is only supported for approved Red Hat +# products. This image is maintained by Red Hat and updated regularly. +from: registry.redhat.io/rhel8-osbs/osbs-ubi8-minimal osbs: configuration: container: From 080e97cb92933e1f79dcaf18404ab84dffb3baf9 Mon Sep 17 00:00:00 2001 From: Jonathan Dowland Date: Mon, 19 May 2025 15:24:13 +0100 Subject: [PATCH 2/2] Bump version for next release We skip 1.22 to align with the UBI9 image versions. Signed-off-by: Jonathan Dowland Revert "Bump version for next release" This reverts commit 04b69d2f06ea739921725e8abdacc28b4aee62b7. --- ubi8-openjdk-11-runtime.yaml | 2 +- ubi8-openjdk-11.yaml | 2 +- ubi8-openjdk-17-runtime.yaml | 2 +- ubi8-openjdk-17.yaml | 2 +- ubi8-openjdk-21-runtime.yaml | 2 +- ubi8-openjdk-21.yaml | 2 +- ubi8-openjdk-8-runtime.yaml | 2 +- ubi8-openjdk-8.yaml | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/ubi8-openjdk-11-runtime.yaml b/ubi8-openjdk-11-runtime.yaml index 208af93c..118d6092 100644 --- a/ubi8-openjdk-11-runtime.yaml +++ b/ubi8-openjdk-11-runtime.yaml @@ -4,7 +4,7 @@ schema_version: 1 from: "registry.access.redhat.com/ubi8/ubi-minimal" name: &name "ubi8/openjdk-11-runtime" -version: &version "1.21" +version: &version "1.23" description: "Image for Red Hat OpenShift providing OpenJDK 11 runtime" labels: diff --git a/ubi8-openjdk-11.yaml b/ubi8-openjdk-11.yaml index 57db32e5..b142c47f 100644 --- a/ubi8-openjdk-11.yaml +++ b/ubi8-openjdk-11.yaml @@ -4,7 +4,7 @@ schema_version: 1 from: "registry.access.redhat.com/ubi8/ubi-minimal" name: &name "ubi8/openjdk-11" -version: &version "1.21" +version: &version "1.23" description: "Source To Image (S2I) image for Red Hat OpenShift providing OpenJDK 11" labels: diff --git a/ubi8-openjdk-17-runtime.yaml b/ubi8-openjdk-17-runtime.yaml index 785e43f4..e7fbce26 100644 --- a/ubi8-openjdk-17-runtime.yaml +++ b/ubi8-openjdk-17-runtime.yaml @@ -4,7 +4,7 @@ schema_version: 1 from: "registry.access.redhat.com/ubi8/ubi-minimal" name: &name "ubi8/openjdk-17-runtime" -version: &version "1.21" +version: &version "1.23" description: "Image for Red Hat OpenShift providing OpenJDK 17 runtime" labels: diff --git a/ubi8-openjdk-17.yaml b/ubi8-openjdk-17.yaml index 1c2d5285..f5f9497c 100644 --- a/ubi8-openjdk-17.yaml +++ b/ubi8-openjdk-17.yaml @@ -4,7 +4,7 @@ schema_version: 1 from: "registry.access.redhat.com/ubi8/ubi-minimal" name: &name "ubi8/openjdk-17" -version: &version "1.21" +version: &version "1.23" description: "Source To Image (S2I) image for Red Hat OpenShift providing OpenJDK 17" labels: diff --git a/ubi8-openjdk-21-runtime.yaml b/ubi8-openjdk-21-runtime.yaml index b259e9ec..102ef3a3 100644 --- a/ubi8-openjdk-21-runtime.yaml +++ b/ubi8-openjdk-21-runtime.yaml @@ -4,7 +4,7 @@ schema_version: 1 from: "registry.access.redhat.com/ubi8/ubi-minimal" name: &name "ubi8/openjdk-21-runtime" -version: &version "1.21" +version: &version "1.23" description: "Image for Red Hat OpenShift providing OpenJDK 21 runtime" labels: diff --git a/ubi8-openjdk-21.yaml b/ubi8-openjdk-21.yaml index 6c162052..ecbfb757 100644 --- a/ubi8-openjdk-21.yaml +++ b/ubi8-openjdk-21.yaml @@ -4,7 +4,7 @@ schema_version: 1 from: "registry.access.redhat.com/ubi8/ubi-minimal" name: &name "ubi8/openjdk-21" -version: &version "1.21" +version: &version "1.23" description: "Source To Image (S2I) image for Red Hat OpenShift providing OpenJDK 21" labels: diff --git a/ubi8-openjdk-8-runtime.yaml b/ubi8-openjdk-8-runtime.yaml index 039eeba6..65bf81ac 100644 --- a/ubi8-openjdk-8-runtime.yaml +++ b/ubi8-openjdk-8-runtime.yaml @@ -4,7 +4,7 @@ schema_version: 1 from: "registry.access.redhat.com/ubi8/ubi-minimal" name: &name "ubi8/openjdk-8-runtime" -version: &version "1.21" +version: &version "1.23" description: "Image for Red Hat OpenShift providing OpenJDK 1.8 runtime" labels: diff --git a/ubi8-openjdk-8.yaml b/ubi8-openjdk-8.yaml index 4bb53fb9..b930beef 100644 --- a/ubi8-openjdk-8.yaml +++ b/ubi8-openjdk-8.yaml @@ -4,7 +4,7 @@ schema_version: 1 from: "registry.access.redhat.com/ubi8/ubi-minimal" name: &name "ubi8/openjdk-8" -version: &version "1.21" +version: &version "1.23" description: "Source To Image (S2I) image for Red Hat OpenShift providing OpenJDK 1.8" labels: