From 5f5bd164d1d628487b99cc255d48aa109db05663 Mon Sep 17 00:00:00 2001 From: Melissa Lee Date: Mon, 13 Jan 2025 13:23:40 -0800 Subject: [PATCH 1/2] Add Liberty version labels --- ga/latest/kernel/Dockerfile.ubi.ibmjava8 | 2 ++ ga/latest/kernel/Dockerfile.ubi.openjdk11 | 2 ++ ga/latest/kernel/Dockerfile.ubi.openjdk17 | 2 ++ ga/latest/kernel/Dockerfile.ubi.openjdk21 | 2 ++ ga/latest/kernel/Dockerfile.ubi.openjdk8 | 2 ++ ga/latest/kernel/Dockerfile.ubuntu.ibmjava8 | 4 +++- ga/latest/kernel/Dockerfile.ubuntu.openjdk11 | 4 +++- ga/latest/kernel/Dockerfile.ubuntu.openjdk17 | 4 +++- 8 files changed, 19 insertions(+), 3 deletions(-) diff --git a/ga/latest/kernel/Dockerfile.ubi.ibmjava8 b/ga/latest/kernel/Dockerfile.ubi.ibmjava8 index e0775fb4f..9f0f2d272 100644 --- a/ga/latest/kernel/Dockerfile.ubi.ibmjava8 +++ b/ga/latest/kernel/Dockerfile.ubi.ibmjava8 @@ -59,6 +59,8 @@ LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Thomas Watson, Wend org.opencontainers.image.revision="$LIBERTY_BUILD_LABEL" \ org.opencontainers.image.description="This image contains the WebSphere Liberty runtime with IBM's Java and Red Hat's UBI 8 as the base OS. For more information on this image please see https://ibm.biz/wl-app-image-template" \ org.opencontainers.image.title="IBM WebSphere Liberty" \ + liberty.version=$LIBERTY_VERSION \ + com.ibm.websphere.liberty.version=$LIBERTY_VERSION \ vendor="IBM" \ name="IBM WebSphere Liberty" \ version="$LIBERTY_VERSION" \ diff --git a/ga/latest/kernel/Dockerfile.ubi.openjdk11 b/ga/latest/kernel/Dockerfile.ubi.openjdk11 index 284f9778a..c758d903a 100644 --- a/ga/latest/kernel/Dockerfile.ubi.openjdk11 +++ b/ga/latest/kernel/Dockerfile.ubi.openjdk11 @@ -60,6 +60,8 @@ LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Thomas Watson, Wend org.opencontainers.image.revision="$LIBERTY_BUILD_LABEL" \ org.opencontainers.image.description="This image contains the WebSphere Liberty runtime with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and Red Hat's UBI 8 as the base OS. For more information on this image please see https://ibm.biz/wl-app-image-template" \ org.opencontainers.image.title="IBM WebSphere Liberty" \ + liberty.version=$LIBERTY_VERSION \ + com.ibm.websphere.liberty.version=$LIBERTY_VERSION \ vendor="IBM" \ name="IBM WebSphere Liberty" \ version="$LIBERTY_VERSION" \ diff --git a/ga/latest/kernel/Dockerfile.ubi.openjdk17 b/ga/latest/kernel/Dockerfile.ubi.openjdk17 index acbb1e565..31e9e1c3a 100644 --- a/ga/latest/kernel/Dockerfile.ubi.openjdk17 +++ b/ga/latest/kernel/Dockerfile.ubi.openjdk17 @@ -59,6 +59,8 @@ LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Thomas Watson, Wend org.opencontainers.image.revision="$LIBERTY_BUILD_LABEL" \ org.opencontainers.image.description="This image contains the WebSphere Liberty runtime with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and Red Hat's UBI 8 as the base OS. For more information on this image please see https://ibm.biz/wl-app-image-template" \ org.opencontainers.image.title="IBM WebSphere Liberty" \ + liberty.version=$LIBERTY_VERSION \ + com.ibm.websphere.liberty.version=$LIBERTY_VERSION \ vendor="IBM" \ name="IBM WebSphere Liberty" \ version="$LIBERTY_VERSION" \ diff --git a/ga/latest/kernel/Dockerfile.ubi.openjdk21 b/ga/latest/kernel/Dockerfile.ubi.openjdk21 index c506cf5ca..49268a4fb 100644 --- a/ga/latest/kernel/Dockerfile.ubi.openjdk21 +++ b/ga/latest/kernel/Dockerfile.ubi.openjdk21 @@ -58,6 +58,8 @@ LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Thomas Watson, Wend org.opencontainers.image.revision="$LIBERTY_BUILD_LABEL" \ org.opencontainers.image.description="This image contains the WebSphere Liberty runtime with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and Red Hat's UBI 9 minimal as the base OS. For more information on this image please see https://ibm.biz/wl-app-image-template" \ org.opencontainers.image.title="IBM WebSphere Liberty" \ + liberty.version=$LIBERTY_VERSION \ + com.ibm.websphere.liberty.version=$LIBERTY_VERSION \ vendor="IBM" \ name="IBM WebSphere Liberty" \ version="$LIBERTY_VERSION" \ diff --git a/ga/latest/kernel/Dockerfile.ubi.openjdk8 b/ga/latest/kernel/Dockerfile.ubi.openjdk8 index 8d1ecf1d9..c3197238c 100644 --- a/ga/latest/kernel/Dockerfile.ubi.openjdk8 +++ b/ga/latest/kernel/Dockerfile.ubi.openjdk8 @@ -59,6 +59,8 @@ LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Thomas Watson, Wend org.opencontainers.image.revision="$LIBERTY_BUILD_LABEL" \ org.opencontainers.image.description="This image contains the WebSphere Liberty runtime with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and Red Hat's UBI 8 as the base OS. For more information on this image please see https://ibm.biz/wl-app-image-template" \ org.opencontainers.image.title="IBM WebSphere Liberty" \ + liberty.version=$LIBERTY_VERSION \ + com.ibm.websphere.liberty.version=$LIBERTY_VERSION \ vendor="IBM" \ name="IBM WebSphere Liberty" \ version="$LIBERTY_VERSION" \ diff --git a/ga/latest/kernel/Dockerfile.ubuntu.ibmjava8 b/ga/latest/kernel/Dockerfile.ubuntu.ibmjava8 index 387f30ccf..586f6b61e 100644 --- a/ga/latest/kernel/Dockerfile.ubuntu.ibmjava8 +++ b/ga/latest/kernel/Dockerfile.ubuntu.ibmjava8 @@ -30,7 +30,9 @@ LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Thomas Watson, Wend org.opencontainers.image.version="$LIBERTY_VERSION" \ org.opencontainers.image.revision="$LIBERTY_BUILD_LABEL" \ org.opencontainers.image.description="This image contains the WebSphere Liberty runtime with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and Ubuntu as the base OS. For more information on this image please see https://ibm.biz/wl-app-image-template" \ - org.opencontainers.image.title="IBM WebSphere Liberty" + org.opencontainers.image.title="IBM WebSphere Liberty" \ + liberty.version=$LIBERTY_VERSION \ + com.ibm.websphere.liberty.version=$LIBERTY_VERSION ENV PATH=$PATH:/opt/ibm/wlp/bin:/opt/ibm/helpers/build diff --git a/ga/latest/kernel/Dockerfile.ubuntu.openjdk11 b/ga/latest/kernel/Dockerfile.ubuntu.openjdk11 index 8765d7d7c..c4bc051ac 100644 --- a/ga/latest/kernel/Dockerfile.ubuntu.openjdk11 +++ b/ga/latest/kernel/Dockerfile.ubuntu.openjdk11 @@ -30,7 +30,9 @@ LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Thomas Watson, Wend org.opencontainers.image.version="$LIBERTY_VERSION" \ org.opencontainers.image.revision="$LIBERTY_BUILD_LABEL" \ org.opencontainers.image.description="This image contains the WebSphere Liberty runtime with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and Ubuntu as the base OS. For more information on this image please see https://ibm.biz/wl-app-image-template" \ - org.opencontainers.image.title="IBM WebSphere Liberty" + org.opencontainers.image.title="IBM WebSphere Liberty" \ + liberty.version=$LIBERTY_VERSION \ + com.ibm.websphere.liberty.version=$LIBERTY_VERSION ENV PATH=$PATH:/opt/ibm/wlp/bin:/opt/ibm/helpers/build diff --git a/ga/latest/kernel/Dockerfile.ubuntu.openjdk17 b/ga/latest/kernel/Dockerfile.ubuntu.openjdk17 index 50e215bcf..a45d08e19 100644 --- a/ga/latest/kernel/Dockerfile.ubuntu.openjdk17 +++ b/ga/latest/kernel/Dockerfile.ubuntu.openjdk17 @@ -30,7 +30,9 @@ LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Thomas Watson, Wend org.opencontainers.image.version="$LIBERTY_VERSION" \ org.opencontainers.image.revision="$LIBERTY_BUILD_LABEL" \ org.opencontainers.image.description="This image contains the WebSphere Liberty runtime with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and Ubuntu as the base OS. For more information on this image please see https://ibm.biz/wl-app-image-template" \ - org.opencontainers.image.title="IBM WebSphere Liberty" + org.opencontainers.image.title="IBM WebSphere Liberty" \ + liberty.version=$LIBERTY_VERSION \ + com.ibm.websphere.liberty.version=$LIBERTY_VERSION ENV PATH=$PATH:/opt/ibm/wlp/bin:/opt/ibm/helpers/build From eecc403a5611ae82dbcb60d5cea33e22efe6bf7b Mon Sep 17 00:00:00 2001 From: Melissa Lee Date: Mon, 13 Jan 2025 13:36:27 -0800 Subject: [PATCH 2/2] Labels in quotes --- ga/latest/kernel/Dockerfile.ubi.ibmjava8 | 4 ++-- ga/latest/kernel/Dockerfile.ubi.openjdk11 | 4 ++-- ga/latest/kernel/Dockerfile.ubi.openjdk17 | 4 ++-- ga/latest/kernel/Dockerfile.ubi.openjdk21 | 4 ++-- ga/latest/kernel/Dockerfile.ubi.openjdk8 | 4 ++-- ga/latest/kernel/Dockerfile.ubuntu.ibmjava8 | 4 ++-- ga/latest/kernel/Dockerfile.ubuntu.openjdk11 | 4 ++-- ga/latest/kernel/Dockerfile.ubuntu.openjdk17 | 4 ++-- 8 files changed, 16 insertions(+), 16 deletions(-) diff --git a/ga/latest/kernel/Dockerfile.ubi.ibmjava8 b/ga/latest/kernel/Dockerfile.ubi.ibmjava8 index 9f0f2d272..495598cbe 100644 --- a/ga/latest/kernel/Dockerfile.ubi.ibmjava8 +++ b/ga/latest/kernel/Dockerfile.ubi.ibmjava8 @@ -59,8 +59,8 @@ LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Thomas Watson, Wend org.opencontainers.image.revision="$LIBERTY_BUILD_LABEL" \ org.opencontainers.image.description="This image contains the WebSphere Liberty runtime with IBM's Java and Red Hat's UBI 8 as the base OS. For more information on this image please see https://ibm.biz/wl-app-image-template" \ org.opencontainers.image.title="IBM WebSphere Liberty" \ - liberty.version=$LIBERTY_VERSION \ - com.ibm.websphere.liberty.version=$LIBERTY_VERSION \ + liberty.version="$LIBERTY_VERSION" \ + com.ibm.websphere.liberty.version="$LIBERTY_VERSION" \ vendor="IBM" \ name="IBM WebSphere Liberty" \ version="$LIBERTY_VERSION" \ diff --git a/ga/latest/kernel/Dockerfile.ubi.openjdk11 b/ga/latest/kernel/Dockerfile.ubi.openjdk11 index c758d903a..4017a15c7 100644 --- a/ga/latest/kernel/Dockerfile.ubi.openjdk11 +++ b/ga/latest/kernel/Dockerfile.ubi.openjdk11 @@ -60,8 +60,8 @@ LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Thomas Watson, Wend org.opencontainers.image.revision="$LIBERTY_BUILD_LABEL" \ org.opencontainers.image.description="This image contains the WebSphere Liberty runtime with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and Red Hat's UBI 8 as the base OS. For more information on this image please see https://ibm.biz/wl-app-image-template" \ org.opencontainers.image.title="IBM WebSphere Liberty" \ - liberty.version=$LIBERTY_VERSION \ - com.ibm.websphere.liberty.version=$LIBERTY_VERSION \ + liberty.version="$LIBERTY_VERSION" \ + com.ibm.websphere.liberty.version="$LIBERTY_VERSION" \ vendor="IBM" \ name="IBM WebSphere Liberty" \ version="$LIBERTY_VERSION" \ diff --git a/ga/latest/kernel/Dockerfile.ubi.openjdk17 b/ga/latest/kernel/Dockerfile.ubi.openjdk17 index 31e9e1c3a..a49bdf3c9 100644 --- a/ga/latest/kernel/Dockerfile.ubi.openjdk17 +++ b/ga/latest/kernel/Dockerfile.ubi.openjdk17 @@ -59,8 +59,8 @@ LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Thomas Watson, Wend org.opencontainers.image.revision="$LIBERTY_BUILD_LABEL" \ org.opencontainers.image.description="This image contains the WebSphere Liberty runtime with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and Red Hat's UBI 8 as the base OS. For more information on this image please see https://ibm.biz/wl-app-image-template" \ org.opencontainers.image.title="IBM WebSphere Liberty" \ - liberty.version=$LIBERTY_VERSION \ - com.ibm.websphere.liberty.version=$LIBERTY_VERSION \ + liberty.version="$LIBERTY_VERSION" \ + com.ibm.websphere.liberty.version="$LIBERTY_VERSION" \ vendor="IBM" \ name="IBM WebSphere Liberty" \ version="$LIBERTY_VERSION" \ diff --git a/ga/latest/kernel/Dockerfile.ubi.openjdk21 b/ga/latest/kernel/Dockerfile.ubi.openjdk21 index 49268a4fb..f5f8b8417 100644 --- a/ga/latest/kernel/Dockerfile.ubi.openjdk21 +++ b/ga/latest/kernel/Dockerfile.ubi.openjdk21 @@ -58,8 +58,8 @@ LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Thomas Watson, Wend org.opencontainers.image.revision="$LIBERTY_BUILD_LABEL" \ org.opencontainers.image.description="This image contains the WebSphere Liberty runtime with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and Red Hat's UBI 9 minimal as the base OS. For more information on this image please see https://ibm.biz/wl-app-image-template" \ org.opencontainers.image.title="IBM WebSphere Liberty" \ - liberty.version=$LIBERTY_VERSION \ - com.ibm.websphere.liberty.version=$LIBERTY_VERSION \ + liberty.version="$LIBERTY_VERSION" \ + com.ibm.websphere.liberty.version="$LIBERTY_VERSION" \ vendor="IBM" \ name="IBM WebSphere Liberty" \ version="$LIBERTY_VERSION" \ diff --git a/ga/latest/kernel/Dockerfile.ubi.openjdk8 b/ga/latest/kernel/Dockerfile.ubi.openjdk8 index c3197238c..0c2ffc4c0 100644 --- a/ga/latest/kernel/Dockerfile.ubi.openjdk8 +++ b/ga/latest/kernel/Dockerfile.ubi.openjdk8 @@ -59,8 +59,8 @@ LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Thomas Watson, Wend org.opencontainers.image.revision="$LIBERTY_BUILD_LABEL" \ org.opencontainers.image.description="This image contains the WebSphere Liberty runtime with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and Red Hat's UBI 8 as the base OS. For more information on this image please see https://ibm.biz/wl-app-image-template" \ org.opencontainers.image.title="IBM WebSphere Liberty" \ - liberty.version=$LIBERTY_VERSION \ - com.ibm.websphere.liberty.version=$LIBERTY_VERSION \ + liberty.version="$LIBERTY_VERSION" \ + com.ibm.websphere.liberty.version="$LIBERTY_VERSION" \ vendor="IBM" \ name="IBM WebSphere Liberty" \ version="$LIBERTY_VERSION" \ diff --git a/ga/latest/kernel/Dockerfile.ubuntu.ibmjava8 b/ga/latest/kernel/Dockerfile.ubuntu.ibmjava8 index 586f6b61e..ea8cbbb59 100644 --- a/ga/latest/kernel/Dockerfile.ubuntu.ibmjava8 +++ b/ga/latest/kernel/Dockerfile.ubuntu.ibmjava8 @@ -31,8 +31,8 @@ LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Thomas Watson, Wend org.opencontainers.image.revision="$LIBERTY_BUILD_LABEL" \ org.opencontainers.image.description="This image contains the WebSphere Liberty runtime with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and Ubuntu as the base OS. For more information on this image please see https://ibm.biz/wl-app-image-template" \ org.opencontainers.image.title="IBM WebSphere Liberty" \ - liberty.version=$LIBERTY_VERSION \ - com.ibm.websphere.liberty.version=$LIBERTY_VERSION + liberty.version="$LIBERTY_VERSION" \ + com.ibm.websphere.liberty.version="$LIBERTY_VERSION" ENV PATH=$PATH:/opt/ibm/wlp/bin:/opt/ibm/helpers/build diff --git a/ga/latest/kernel/Dockerfile.ubuntu.openjdk11 b/ga/latest/kernel/Dockerfile.ubuntu.openjdk11 index c4bc051ac..7307b2a66 100644 --- a/ga/latest/kernel/Dockerfile.ubuntu.openjdk11 +++ b/ga/latest/kernel/Dockerfile.ubuntu.openjdk11 @@ -31,8 +31,8 @@ LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Thomas Watson, Wend org.opencontainers.image.revision="$LIBERTY_BUILD_LABEL" \ org.opencontainers.image.description="This image contains the WebSphere Liberty runtime with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and Ubuntu as the base OS. For more information on this image please see https://ibm.biz/wl-app-image-template" \ org.opencontainers.image.title="IBM WebSphere Liberty" \ - liberty.version=$LIBERTY_VERSION \ - com.ibm.websphere.liberty.version=$LIBERTY_VERSION + liberty.version="$LIBERTY_VERSION" \ + com.ibm.websphere.liberty.version="$LIBERTY_VERSION" ENV PATH=$PATH:/opt/ibm/wlp/bin:/opt/ibm/helpers/build diff --git a/ga/latest/kernel/Dockerfile.ubuntu.openjdk17 b/ga/latest/kernel/Dockerfile.ubuntu.openjdk17 index a45d08e19..7121b64f1 100644 --- a/ga/latest/kernel/Dockerfile.ubuntu.openjdk17 +++ b/ga/latest/kernel/Dockerfile.ubuntu.openjdk17 @@ -31,8 +31,8 @@ LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Thomas Watson, Wend org.opencontainers.image.revision="$LIBERTY_BUILD_LABEL" \ org.opencontainers.image.description="This image contains the WebSphere Liberty runtime with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and Ubuntu as the base OS. For more information on this image please see https://ibm.biz/wl-app-image-template" \ org.opencontainers.image.title="IBM WebSphere Liberty" \ - liberty.version=$LIBERTY_VERSION \ - com.ibm.websphere.liberty.version=$LIBERTY_VERSION + liberty.version="$LIBERTY_VERSION" \ + com.ibm.websphere.liberty.version="$LIBERTY_VERSION" ENV PATH=$PATH:/opt/ibm/wlp/bin:/opt/ibm/helpers/build