From 62982a7398959ba09b1ee7c062e20b6441486ac8 Mon Sep 17 00:00:00 2001 From: Jonathan Dowland Date: Wed, 6 Sep 2023 10:19:12 +0100 Subject: [PATCH 1/2] [OPENJDK-2145] Update/add usage: labels to UBI8 images Add a usage: label to JDK11-runtime and JDK8-runtime, pointing at , 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 , 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: Signed-off-by: Jonathan Dowland --- ubi8-openjdk-11-runtime.yaml | 4 ++++ ubi8-openjdk-11.yaml | 4 +++- ubi8-openjdk-17-runtime.yaml | 4 +++- ubi8-openjdk-17.yaml | 4 +++- ubi8-openjdk-8-runtime.yaml | 4 ++++ ubi8-openjdk-8.yaml | 4 +++- 6 files changed, 20 insertions(+), 4 deletions(-) diff --git a/ubi8-openjdk-11-runtime.yaml b/ubi8-openjdk-11-runtime.yaml index 4e465642..e4693ae2 100644 --- a/ubi8-openjdk-11-runtime.yaml +++ b/ubi8-openjdk-11-runtime.yaml @@ -18,8 +18,12 @@ labels: value: "Red Hat OpenJDK " - name: "com.redhat.component" value: "openjdk-11-runtime-ubi8-container" +- name: "usage" + value: &docs "https://jboss-container-images.github.io/openjdk/" - name: "com.redhat.license_terms" value: "https://www.redhat.com/en/about/red-hat-end-user-license-agreements#UBI" +- name: "org.opencontainers.image.documentation" + value: *docs envs: - name: "JBOSS_IMAGE_NAME" diff --git a/ubi8-openjdk-11.yaml b/ubi8-openjdk-11.yaml index 64c09b0b..996a90c5 100644 --- a/ubi8-openjdk-11.yaml +++ b/ubi8-openjdk-11.yaml @@ -19,9 +19,11 @@ labels: - name: "com.redhat.component" value: "openjdk-11-ubi8-container" - name: "usage" - value: "https://access.redhat.com/documentation/en-us/openjdk/11/html/using_openjdk_11_source-to-image_for_openshift/index" + 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" - name: "com.redhat.license_terms" value: "https://www.redhat.com/en/about/red-hat-end-user-license-agreements#UBI" +- name: "org.opencontainers.image.documentation" + value: *docs envs: - name: PATH diff --git a/ubi8-openjdk-17-runtime.yaml b/ubi8-openjdk-17-runtime.yaml index 7778d94f..ca7ac9cd 100644 --- a/ubi8-openjdk-17-runtime.yaml +++ b/ubi8-openjdk-17-runtime.yaml @@ -19,9 +19,11 @@ labels: - name: "com.redhat.component" value: "openjdk-17-runtime-ubi8-container" - name: "usage" - value: "https://access.redhat.com/documentation/en-us/red_hat_jboss_middleware_for_openshift/3/html/red_hat_java_s2i_for_openshift/" + value: &docs "https://jboss-container-images.github.io/openjdk/" - name: "com.redhat.license_terms" value: "https://www.redhat.com/en/about/red-hat-end-user-license-agreements#UBI" +- name: "org.opencontainers.image.documentation" + value: *docs envs: - name: "JBOSS_IMAGE_NAME" diff --git a/ubi8-openjdk-17.yaml b/ubi8-openjdk-17.yaml index 4fba5f7e..5f8b7462 100644 --- a/ubi8-openjdk-17.yaml +++ b/ubi8-openjdk-17.yaml @@ -19,9 +19,11 @@ labels: - name: "com.redhat.component" value: "openjdk-17-ubi8-container" - name: "usage" - value: "https://access.redhat.com/documentation/en-us/red_hat_jboss_middleware_for_openshift/3/html/red_hat_java_s2i_for_openshift/" + value: &docs "https://jboss-container-images.github.io/openjdk/" - name: "com.redhat.license_terms" value: "https://www.redhat.com/en/about/red-hat-end-user-license-agreements#UBI" +- name: "org.opencontainers.image.documentation" + value: *docs envs: - name: PATH diff --git a/ubi8-openjdk-8-runtime.yaml b/ubi8-openjdk-8-runtime.yaml index a218ffeb..7df1144c 100644 --- a/ubi8-openjdk-8-runtime.yaml +++ b/ubi8-openjdk-8-runtime.yaml @@ -18,8 +18,12 @@ labels: value: "Red Hat OpenJDK " - name: "com.redhat.component" value: "openjdk-8-runtime-ubi8-container" +- name: "usage" + value: &docs "https://jboss-container-images.github.io/openjdk/" - name: "com.redhat.license_terms" value: "https://www.redhat.com/en/about/red-hat-end-user-license-agreements#UBI" +- name: "org.opencontainers.image.documentation" + value: *docs envs: - name: "JBOSS_IMAGE_NAME" diff --git a/ubi8-openjdk-8.yaml b/ubi8-openjdk-8.yaml index 87506c24..e51deb61 100644 --- a/ubi8-openjdk-8.yaml +++ b/ubi8-openjdk-8.yaml @@ -19,9 +19,11 @@ labels: - name: "com.redhat.component" value: "openjdk-8-ubi8-container" - name: "usage" - value: "https://access.redhat.com/documentation/en-us/openjdk/8/html/using_openjdk_8_source-to-image_for_openshift/index" + value: &docs "https://access.redhat.com/documentation/en-us/openjdk/8/html/using_openjdk_8_source-to-image_for_openshift/index" - name: "com.redhat.license_terms" value: "https://www.redhat.com/en/about/red-hat-end-user-license-agreements#UBI" +- name: "org.opencontainers.image.documentation" + value: *docs envs: - name: PATH From ffb7761fa0cf436ac21cd802a893119bea42709f Mon Sep 17 00:00:00 2001 From: Jonathan Dowland Date: Wed, 6 Sep 2023 15:55:23 +0100 Subject: [PATCH 2/2] [OPENJDK-2145] usage label consistent across images Use the upstream documentation URI for all images. Signed-off-by: Jonathan Dowland --- ubi8-openjdk-11.yaml | 2 +- ubi8-openjdk-8.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ubi8-openjdk-11.yaml b/ubi8-openjdk-11.yaml index 996a90c5..2596eda8 100644 --- a/ubi8-openjdk-11.yaml +++ b/ubi8-openjdk-11.yaml @@ -19,7 +19,7 @@ labels: - name: "com.redhat.component" value: "openjdk-11-ubi8-container" - name: "usage" - 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" + value: &docs "https://jboss-container-images.github.io/openjdk/" - name: "com.redhat.license_terms" value: "https://www.redhat.com/en/about/red-hat-end-user-license-agreements#UBI" - name: "org.opencontainers.image.documentation" diff --git a/ubi8-openjdk-8.yaml b/ubi8-openjdk-8.yaml index e51deb61..36008861 100644 --- a/ubi8-openjdk-8.yaml +++ b/ubi8-openjdk-8.yaml @@ -19,7 +19,7 @@ labels: - name: "com.redhat.component" value: "openjdk-8-ubi8-container" - name: "usage" - value: &docs "https://access.redhat.com/documentation/en-us/openjdk/8/html/using_openjdk_8_source-to-image_for_openshift/index" + value: &docs "https://jboss-container-images.github.io/openjdk/" - name: "com.redhat.license_terms" value: "https://www.redhat.com/en/about/red-hat-end-user-license-agreements#UBI" - name: "org.opencontainers.image.documentation"