Skip to content

Commit 62982a7

Browse files
committed
[OPENJDK-2145] Update/add usage: labels to UBI8 images
Add a usage: label to JDK11-runtime and JDK8-runtime, pointing at <https://jboss-container-images.github.io/openjdk/>, which is probably the best option for the time being. We don't have specific Red Hat customer documentation for runtime images. Alter the usage: label for JDK17 to <https://jboss-container-images.github.io/openjdk/>, as the old value was for OpenShift 3.x era documentation. Adjust the usage: label for JDK11 to a fixed URI for the same document (It changed at some point in the past and we didn't notice sooner.) For all UBI8 images, additionally define a second label org.opencontainers.image.documentation with the same value, following the OpenContainers Spec, Pre-Defined Annotation Keys: <https://specs.opencontainers.org/image-spec/annotations/> Signed-off-by: Jonathan Dowland <[email protected]>
1 parent a29d280 commit 62982a7

6 files changed

+20
-4
lines changed

ubi8-openjdk-11-runtime.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,12 @@ labels:
1818
value: "Red Hat OpenJDK <[email protected]>"
1919
- name: "com.redhat.component"
2020
value: "openjdk-11-runtime-ubi8-container"
21+
- name: "usage"
22+
value: &docs "https://jboss-container-images.github.io/openjdk/"
2123
- name: "com.redhat.license_terms"
2224
value: "https://www.redhat.com/en/about/red-hat-end-user-license-agreements#UBI"
25+
- name: "org.opencontainers.image.documentation"
26+
value: *docs
2327

2428
envs:
2529
- name: "JBOSS_IMAGE_NAME"

ubi8-openjdk-11.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,11 @@ labels:
1919
- name: "com.redhat.component"
2020
value: "openjdk-11-ubi8-container"
2121
- name: "usage"
22-
value: "https://access.redhat.com/documentation/en-us/openjdk/11/html/using_openjdk_11_source-to-image_for_openshift/index"
22+
value: &docs "https://access.redhat.com/documentation/en-us/openjdk/11/html/using_source-to-image_for_openshift_with_red_hat_build_of_openjdk_11/index"
2323
- name: "com.redhat.license_terms"
2424
value: "https://www.redhat.com/en/about/red-hat-end-user-license-agreements#UBI"
25+
- name: "org.opencontainers.image.documentation"
26+
value: *docs
2527

2628
envs:
2729
- name: PATH

ubi8-openjdk-17-runtime.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,11 @@ labels:
1919
- name: "com.redhat.component"
2020
value: "openjdk-17-runtime-ubi8-container"
2121
- name: "usage"
22-
value: "https://access.redhat.com/documentation/en-us/red_hat_jboss_middleware_for_openshift/3/html/red_hat_java_s2i_for_openshift/"
22+
value: &docs "https://jboss-container-images.github.io/openjdk/"
2323
- name: "com.redhat.license_terms"
2424
value: "https://www.redhat.com/en/about/red-hat-end-user-license-agreements#UBI"
25+
- name: "org.opencontainers.image.documentation"
26+
value: *docs
2527

2628
envs:
2729
- name: "JBOSS_IMAGE_NAME"

ubi8-openjdk-17.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,11 @@ labels:
1919
- name: "com.redhat.component"
2020
value: "openjdk-17-ubi8-container"
2121
- name: "usage"
22-
value: "https://access.redhat.com/documentation/en-us/red_hat_jboss_middleware_for_openshift/3/html/red_hat_java_s2i_for_openshift/"
22+
value: &docs "https://jboss-container-images.github.io/openjdk/"
2323
- name: "com.redhat.license_terms"
2424
value: "https://www.redhat.com/en/about/red-hat-end-user-license-agreements#UBI"
25+
- name: "org.opencontainers.image.documentation"
26+
value: *docs
2527

2628
envs:
2729
- name: PATH

ubi8-openjdk-8-runtime.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,12 @@ labels:
1818
value: "Red Hat OpenJDK <[email protected]>"
1919
- name: "com.redhat.component"
2020
value: "openjdk-8-runtime-ubi8-container"
21+
- name: "usage"
22+
value: &docs "https://jboss-container-images.github.io/openjdk/"
2123
- name: "com.redhat.license_terms"
2224
value: "https://www.redhat.com/en/about/red-hat-end-user-license-agreements#UBI"
25+
- name: "org.opencontainers.image.documentation"
26+
value: *docs
2327

2428
envs:
2529
- name: "JBOSS_IMAGE_NAME"

ubi8-openjdk-8.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,11 @@ labels:
1919
- name: "com.redhat.component"
2020
value: "openjdk-8-ubi8-container"
2121
- name: "usage"
22-
value: "https://access.redhat.com/documentation/en-us/openjdk/8/html/using_openjdk_8_source-to-image_for_openshift/index"
22+
value: &docs "https://access.redhat.com/documentation/en-us/openjdk/8/html/using_openjdk_8_source-to-image_for_openshift/index"
2323
- name: "com.redhat.license_terms"
2424
value: "https://www.redhat.com/en/about/red-hat-end-user-license-agreements#UBI"
25+
- name: "org.opencontainers.image.documentation"
26+
value: *docs
2527

2628
envs:
2729
- name: PATH

0 commit comments

Comments
 (0)