[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 <[email protected]>
rh-openjdk · Nov 13, 2024 · a832436 · a832436
1 parent 179ce26
commit a832436
Show file tree

Hide file tree

Showing 12 changed files with 12 additions and 6 deletions.
diff --git a/redhat/ubi9-openjdk-11-runtime.yaml b/redhat/ubi9-openjdk-11-runtime.yaml
@@ -1,3 +1,4 @@
+from: ubi9-minimal
 osbs:
   configuration:
     container:

diff --git a/redhat/ubi9-openjdk-11.yaml b/redhat/ubi9-openjdk-11.yaml
@@ -1,3 +1,4 @@
+from: ubi9-minimal
 osbs:
   configuration:
     container:

diff --git a/redhat/ubi9-openjdk-17-runtime.yaml b/redhat/ubi9-openjdk-17-runtime.yaml
@@ -1,3 +1,4 @@
+from: ubi9-minimal
 osbs:
   configuration:
     container:

diff --git a/redhat/ubi9-openjdk-17.yaml b/redhat/ubi9-openjdk-17.yaml
@@ -1,3 +1,4 @@
+from: ubi9-minimal
 osbs:
   configuration:
     container:

diff --git a/redhat/ubi9-openjdk-21-runtime.yaml b/redhat/ubi9-openjdk-21-runtime.yaml
@@ -1,3 +1,4 @@
+from: ubi9-minimal
 osbs:
   configuration:
     container:

diff --git a/redhat/ubi9-openjdk-21.yaml b/redhat/ubi9-openjdk-21.yaml
@@ -1,3 +1,4 @@
+from: ubi9-minimal
 osbs:
   configuration:
     container:

diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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"