[OPENJDK-2414] define name and version labels

These shadow the values from our base image which are otherwise misleading, and result in the test "Check that common labels are correctly set" passing. Signed-off-by: Jonathan Dowland <[email protected]>
rh-openjdk · Nov 30, 2023 · 168022e · 168022e
1 parent b697b7d
commit 168022e
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 0 deletions.
diff --git a/ubi9-openjdk-11-runtime.yaml b/ubi9-openjdk-11-runtime.yaml
@@ -24,6 +24,10 @@ labels:
   value: "https://www.redhat.com/en/about/red-hat-end-user-license-agreements#UBI"
 - name: "org.opencontainers.image.documentation"
   value: *docs
+- name: "name"
+  value: *name
+- name: "version"
+  value: *version
 
 envs:
 - name: "JBOSS_IMAGE_NAME"

diff --git a/ubi9-openjdk-11.yaml b/ubi9-openjdk-11.yaml
@@ -24,6 +24,10 @@ labels:
   value: "https://www.redhat.com/en/about/red-hat-end-user-license-agreements#UBI"
 - name: "org.opencontainers.image.documentation"
   value: *docs
+- name: "name"
+  value: *name
+- name: "version"
+  value: *version
 
 envs:
 - name: PATH

diff --git a/ubi9-openjdk-17-runtime.yaml b/ubi9-openjdk-17-runtime.yaml
@@ -24,6 +24,10 @@ labels:
   value: "https://www.redhat.com/en/about/red-hat-end-user-license-agreements#UBI"
 - name: "org.opencontainers.image.documentation"
   value: *docs
+- name: "name"
+  value: *name
+- name: "version"
+  value: *version
 
 envs:
 - name: "JBOSS_IMAGE_NAME"

diff --git a/ubi9-openjdk-17.yaml b/ubi9-openjdk-17.yaml
@@ -24,6 +24,10 @@ labels:
   value: "https://www.redhat.com/en/about/red-hat-end-user-license-agreements#UBI"
 - name: "org.opencontainers.image.documentation"
   value: *docs
+- name: "name"
+  value: *name
+- name: "version"
+  value: *version
 
 envs:
 - name: PATH

diff --git a/ubi9-openjdk-21-runtime.yaml b/ubi9-openjdk-21-runtime.yaml
@@ -22,6 +22,10 @@ labels:
   value: "https://access.redhat.com/documentation/en-us/red_hat_jboss_middleware_for_openshift/3/html/red_hat_java_s2i_for_openshift/"
 - name: "com.redhat.license_terms"
   value: "https://www.redhat.com/en/about/red-hat-end-user-license-agreements#UBI"
+- name: "name"
+  value: *name
+- name: "version"
+  value: *version
 
 envs:
 - name: "JBOSS_IMAGE_NAME"

diff --git a/ubi9-openjdk-21.yaml b/ubi9-openjdk-21.yaml
@@ -22,6 +22,10 @@ labels:
   value: "https://access.redhat.com/documentation/en-us/red_hat_jboss_middleware_for_openshift/3/html/red_hat_java_s2i_for_openshift/"
 - name: "com.redhat.license_terms"
   value: "https://www.redhat.com/en/about/red-hat-end-user-license-agreements#UBI"
+- name: "name"
+  value: *name
+- name: "version"
+  value: *version
 
 envs:
 - name: PATH