From 374c13bda1a76baead6d8077f75aeeb0f46a8e08 Mon Sep 17 00:00:00 2001 From: Jonathan Dowland Date: Tue, 12 Nov 2024 16:21:24 +0000 Subject: [PATCH] [OPENJDK-3430] alter FROM line for redhat builds In the redhat/* overrides files, override "from:" to use the name assigned to RHEL images built via OSBS from 9.5 onwards. https://issues.redhat.com/browse/OPENJDK-3430 Signed-off-by: Jonathan Dowland --- redhat/ubi9-openjdk-11-runtime.yaml | 4 ++++ redhat/ubi9-openjdk-11.yaml | 4 ++++ redhat/ubi9-openjdk-17-runtime.yaml | 4 ++++ redhat/ubi9-openjdk-17.yaml | 4 ++++ redhat/ubi9-openjdk-21-runtime.yaml | 4 ++++ redhat/ubi9-openjdk-21.yaml | 4 ++++ ubi9-openjdk-11-runtime.yaml | 2 +- ubi9-openjdk-11.yaml | 2 +- ubi9-openjdk-17-runtime.yaml | 2 +- ubi9-openjdk-17.yaml | 2 +- ubi9-openjdk-21-runtime.yaml | 2 +- ubi9-openjdk-21.yaml | 2 +- 12 files changed, 30 insertions(+), 6 deletions(-) diff --git a/redhat/ubi9-openjdk-11-runtime.yaml b/redhat/ubi9-openjdk-11-runtime.yaml index ca303541..8262a1c5 100644 --- a/redhat/ubi9-openjdk-11-runtime.yaml +++ b/redhat/ubi9-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/rhel9-osbs/osbs-ubi9-minimal osbs: configuration: container: diff --git a/redhat/ubi9-openjdk-11.yaml b/redhat/ubi9-openjdk-11.yaml index d5a47212..69138b38 100644 --- a/redhat/ubi9-openjdk-11.yaml +++ b/redhat/ubi9-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/rhel9-osbs/osbs-ubi9-minimal osbs: configuration: container: diff --git a/redhat/ubi9-openjdk-17-runtime.yaml b/redhat/ubi9-openjdk-17-runtime.yaml index e28bb5e0..c674a204 100644 --- a/redhat/ubi9-openjdk-17-runtime.yaml +++ b/redhat/ubi9-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/rhel9-osbs/osbs-ubi9-minimal osbs: configuration: container: diff --git a/redhat/ubi9-openjdk-17.yaml b/redhat/ubi9-openjdk-17.yaml index ab819f92..958e1aa2 100644 --- a/redhat/ubi9-openjdk-17.yaml +++ b/redhat/ubi9-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/rhel9-osbs/osbs-ubi9-minimal osbs: configuration: container: diff --git a/redhat/ubi9-openjdk-21-runtime.yaml b/redhat/ubi9-openjdk-21-runtime.yaml index 4fbf936e..8f67a7d4 100644 --- a/redhat/ubi9-openjdk-21-runtime.yaml +++ b/redhat/ubi9-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/rhel9-osbs/osbs-ubi9-minimal osbs: configuration: container: diff --git a/redhat/ubi9-openjdk-21.yaml b/redhat/ubi9-openjdk-21.yaml index 5ce6f524..19905492 100644 --- a/redhat/ubi9-openjdk-21.yaml +++ b/redhat/ubi9-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/rhel9-osbs/osbs-ubi9-minimal osbs: configuration: container: diff --git a/ubi9-openjdk-11-runtime.yaml b/ubi9-openjdk-11-runtime.yaml index d9f70167..a0e9e69d 100644 --- a/ubi9-openjdk-11-runtime.yaml +++ b/ubi9-openjdk-11-runtime.yaml @@ -2,7 +2,7 @@ schema_version: 1 -from: "registry.access.redhat.com/ubi9/ubi-minimal:9.4" +from: "registry.access.redhat.com/ubi9/ubi-minimal" name: &name "ubi9/openjdk-11-runtime" version: &version "1.20" description: "Image for Red Hat OpenShift providing OpenJDK 11 runtime" diff --git a/ubi9-openjdk-11.yaml b/ubi9-openjdk-11.yaml index 66a48fef..83cc3513 100644 --- a/ubi9-openjdk-11.yaml +++ b/ubi9-openjdk-11.yaml @@ -2,7 +2,7 @@ schema_version: 1 -from: "registry.access.redhat.com/ubi9/ubi-minimal:9.4" +from: "registry.access.redhat.com/ubi9/ubi-minimal" name: &name "ubi9/openjdk-11" version: &version "1.20" description: "Source To Image (S2I) image for Red Hat OpenShift providing OpenJDK 11" diff --git a/ubi9-openjdk-17-runtime.yaml b/ubi9-openjdk-17-runtime.yaml index 7d8d3697..3d72a716 100644 --- a/ubi9-openjdk-17-runtime.yaml +++ b/ubi9-openjdk-17-runtime.yaml @@ -2,7 +2,7 @@ schema_version: 1 -from: "registry.access.redhat.com/ubi9/ubi-minimal:9.4" +from: "registry.access.redhat.com/ubi9/ubi-minimal" name: &name "ubi9/openjdk-17-runtime" version: &version "1.21" description: "Image for Red Hat OpenShift providing OpenJDK 17 runtime" diff --git a/ubi9-openjdk-17.yaml b/ubi9-openjdk-17.yaml index 35cd4cba..825027ff 100644 --- a/ubi9-openjdk-17.yaml +++ b/ubi9-openjdk-17.yaml @@ -2,7 +2,7 @@ schema_version: 1 -from: "registry.access.redhat.com/ubi9/ubi-minimal:9.4" +from: "registry.access.redhat.com/ubi9/ubi-minimal" name: &name "ubi9/openjdk-17" version: &version "1.21" description: "Source To Image (S2I) image for Red Hat OpenShift providing OpenJDK 17" diff --git a/ubi9-openjdk-21-runtime.yaml b/ubi9-openjdk-21-runtime.yaml index 03139b98..74400dd2 100644 --- a/ubi9-openjdk-21-runtime.yaml +++ b/ubi9-openjdk-21-runtime.yaml @@ -2,7 +2,7 @@ schema_version: 1 -from: "registry.access.redhat.com/ubi9/ubi-minimal:9.4" +from: "registry.access.redhat.com/ubi9/ubi-minimal" name: &name "ubi9/openjdk-21-runtime" version: &version "1.21" description: "Image for Red Hat OpenShift providing OpenJDK 21 runtime" diff --git a/ubi9-openjdk-21.yaml b/ubi9-openjdk-21.yaml index 56cab7f8..5caddc97 100644 --- a/ubi9-openjdk-21.yaml +++ b/ubi9-openjdk-21.yaml @@ -2,7 +2,7 @@ schema_version: 1 -from: "registry.access.redhat.com/ubi9/ubi-minimal:9.4" +from: "registry.access.redhat.com/ubi9/ubi-minimal" name: &name "ubi9/openjdk-21" version: &version "1.21" description: "Source To Image (S2I) image for Red Hat OpenShift providing OpenJDK 21"