Skip to content

Commit 374c13b

Browse files
jmtdjmtd
committedNov 13, 2024
[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 <jdowland@redhat.com>
1 parent 179ce26 commit 374c13b

12 files changed

+30
-6
lines changed
 

‎redhat/ubi9-openjdk-11-runtime.yaml

+4
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
# This OSBS Base Image is designed and engineered to be the base layer for
2+
# Red Hat products. This base image is only supported for approved Red Hat
3+
# products. This image is maintained by Red Hat and updated regularly.
4+
from: registry.redhat.io/rhel9-osbs/osbs-ubi9-minimal
15
osbs:
26
configuration:
37
container:

‎redhat/ubi9-openjdk-11.yaml

+4
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
# This OSBS Base Image is designed and engineered to be the base layer for
2+
# Red Hat products. This base image is only supported for approved Red Hat
3+
# products. This image is maintained by Red Hat and updated regularly.
4+
from: registry.redhat.io/rhel9-osbs/osbs-ubi9-minimal
15
osbs:
26
configuration:
37
container:

‎redhat/ubi9-openjdk-17-runtime.yaml

+4
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
# This OSBS Base Image is designed and engineered to be the base layer for
2+
# Red Hat products. This base image is only supported for approved Red Hat
3+
# products. This image is maintained by Red Hat and updated regularly.
4+
from: registry.redhat.io/rhel9-osbs/osbs-ubi9-minimal
15
osbs:
26
configuration:
37
container:

‎redhat/ubi9-openjdk-17.yaml

+4
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
# This OSBS Base Image is designed and engineered to be the base layer for
2+
# Red Hat products. This base image is only supported for approved Red Hat
3+
# products. This image is maintained by Red Hat and updated regularly.
4+
from: registry.redhat.io/rhel9-osbs/osbs-ubi9-minimal
15
osbs:
26
configuration:
37
container:

‎redhat/ubi9-openjdk-21-runtime.yaml

+4
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
# This OSBS Base Image is designed and engineered to be the base layer for
2+
# Red Hat products. This base image is only supported for approved Red Hat
3+
# products. This image is maintained by Red Hat and updated regularly.
4+
from: registry.redhat.io/rhel9-osbs/osbs-ubi9-minimal
15
osbs:
26
configuration:
37
container:

‎redhat/ubi9-openjdk-21.yaml

+4
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
# This OSBS Base Image is designed and engineered to be the base layer for
2+
# Red Hat products. This base image is only supported for approved Red Hat
3+
# products. This image is maintained by Red Hat and updated regularly.
4+
from: registry.redhat.io/rhel9-osbs/osbs-ubi9-minimal
15
osbs:
26
configuration:
37
container:

‎ubi9-openjdk-11-runtime.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
schema_version: 1
44

5-
from: "registry.access.redhat.com/ubi9/ubi-minimal:9.4"
5+
from: "registry.access.redhat.com/ubi9/ubi-minimal"
66
name: &name "ubi9/openjdk-11-runtime"
77
version: &version "1.20"
88
description: "Image for Red Hat OpenShift providing OpenJDK 11 runtime"

‎ubi9-openjdk-11.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
schema_version: 1
44

5-
from: "registry.access.redhat.com/ubi9/ubi-minimal:9.4"
5+
from: "registry.access.redhat.com/ubi9/ubi-minimal"
66
name: &name "ubi9/openjdk-11"
77
version: &version "1.20"
88
description: "Source To Image (S2I) image for Red Hat OpenShift providing OpenJDK 11"

‎ubi9-openjdk-17-runtime.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
schema_version: 1
44

5-
from: "registry.access.redhat.com/ubi9/ubi-minimal:9.4"
5+
from: "registry.access.redhat.com/ubi9/ubi-minimal"
66
name: &name "ubi9/openjdk-17-runtime"
77
version: &version "1.21"
88
description: "Image for Red Hat OpenShift providing OpenJDK 17 runtime"

‎ubi9-openjdk-17.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
schema_version: 1
44

5-
from: "registry.access.redhat.com/ubi9/ubi-minimal:9.4"
5+
from: "registry.access.redhat.com/ubi9/ubi-minimal"
66
name: &name "ubi9/openjdk-17"
77
version: &version "1.21"
88
description: "Source To Image (S2I) image for Red Hat OpenShift providing OpenJDK 17"

‎ubi9-openjdk-21-runtime.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
schema_version: 1
44

5-
from: "registry.access.redhat.com/ubi9/ubi-minimal:9.4"
5+
from: "registry.access.redhat.com/ubi9/ubi-minimal"
66
name: &name "ubi9/openjdk-21-runtime"
77
version: &version "1.21"
88
description: "Image for Red Hat OpenShift providing OpenJDK 21 runtime"

‎ubi9-openjdk-21.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
schema_version: 1
44

5-
from: "registry.access.redhat.com/ubi9/ubi-minimal:9.4"
5+
from: "registry.access.redhat.com/ubi9/ubi-minimal"
66
name: &name "ubi9/openjdk-21"
77
version: &version "1.21"
88
description: "Source To Image (S2I) image for Red Hat OpenShift providing OpenJDK 21"

0 commit comments

Comments
 (0)