From 3180387ed54e70aaa65f96964ae81557369bfbb5 Mon Sep 17 00:00:00 2001 From: kabicin Date: Wed, 6 Dec 2023 09:22:21 -0500 Subject: [PATCH] Move label/env after dumb-init --- ga/23.0.0.12/kernel/Dockerfile.ubi.ibmjava8 | 44 +++++++++---------- ga/23.0.0.12/kernel/Dockerfile.ubi.openjdk11 | 44 +++++++++---------- ga/23.0.0.12/kernel/Dockerfile.ubi.openjdk17 | 44 +++++++++---------- ga/23.0.0.12/kernel/Dockerfile.ubi.openjdk8 | 44 +++++++++---------- .../kernel/Dockerfile.ubuntu.ibmjava8 | 34 +++++++------- .../kernel/Dockerfile.ubuntu.openjdk11 | 34 +++++++------- .../kernel/Dockerfile.ubuntu.openjdk17 | 34 +++++++------- ga/23.0.0.9/kernel/Dockerfile.ubi.ibmjava8 | 44 +++++++++---------- ga/23.0.0.9/kernel/Dockerfile.ubi.openjdk11 | 44 +++++++++---------- ga/23.0.0.9/kernel/Dockerfile.ubi.openjdk17 | 44 +++++++++---------- ga/23.0.0.9/kernel/Dockerfile.ubi.openjdk8 | 44 +++++++++---------- ga/23.0.0.9/kernel/Dockerfile.ubuntu.ibmjava8 | 34 +++++++------- .../kernel/Dockerfile.ubuntu.openjdk11 | 34 +++++++------- .../kernel/Dockerfile.ubuntu.openjdk17 | 34 +++++++------- ga/latest/kernel/Dockerfile.ubi.ibmjava8 | 44 +++++++++---------- ga/latest/kernel/Dockerfile.ubi.openjdk11 | 44 +++++++++---------- ga/latest/kernel/Dockerfile.ubi.openjdk17 | 44 +++++++++---------- ga/latest/kernel/Dockerfile.ubi.openjdk8 | 44 +++++++++---------- ga/latest/kernel/Dockerfile.ubuntu.ibmjava8 | 34 +++++++------- ga/latest/kernel/Dockerfile.ubuntu.openjdk11 | 34 +++++++------- ga/latest/kernel/Dockerfile.ubuntu.openjdk17 | 34 +++++++------- 21 files changed, 417 insertions(+), 417 deletions(-) diff --git a/ga/23.0.0.12/kernel/Dockerfile.ubi.ibmjava8 b/ga/23.0.0.12/kernel/Dockerfile.ubi.ibmjava8 index baac67fe..56e16614 100644 --- a/ga/23.0.0.12/kernel/Dockerfile.ubi.ibmjava8 +++ b/ga/23.0.0.12/kernel/Dockerfile.ubi.ibmjava8 @@ -48,28 +48,6 @@ ARG OPENJ9_SCC=true ARG LIBERTY_VERSION=23.0.0.12 ARG LIBERTY_BUILD_LABEL=replace_with_gm_driver_label -LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Thomas Watson, Wendy Raschke, Michal Broz" \ - org.opencontainers.image.vendor="IBM" \ - org.opencontainers.image.url="https://github.com/WASdev/ci.docker" \ - org.opencontainers.image.documentation="https://www.ibm.com/support/knowledgecenter/SSAW57_liberty/com.ibm.websphere.wlp.nd.multiplatform.doc/ae/cwlp_about.html" \ - 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'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" \ - vendor="IBM" \ - name="IBM WebSphere Liberty" \ - version="$LIBERTY_VERSION" \ - summary="Image for WebSphere Liberty with IBM's Java and Red Hat's UBI 8" \ - 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" - -ENV PATH=$PATH:/opt/ibm/wlp/bin:/opt/ibm/helpers/build - -# Add labels for consumption by IBM Product Insights -LABEL "ProductID"="fbf6a96d49214c0abc6a3bc5da6e48cd" \ - "ProductName"="WebSphere Application Server Liberty" \ - "ProductVersion"="$LIBERTY_VERSION" \ - "BuildLabel"="$LIBERTY_BUILD_LABEL" - # Install dumb-init RUN set -eux; \ ARCH="$(uname -m)"; \ @@ -99,6 +77,28 @@ RUN set -eux; \ echo "${DUMB_INIT_SHA256} */usr/bin/dumb-init" | sha256sum -c -; \ chmod +x /usr/bin/dumb-init; +LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Thomas Watson, Wendy Raschke, Michal Broz" \ + org.opencontainers.image.vendor="IBM" \ + org.opencontainers.image.url="https://github.com/WASdev/ci.docker" \ + org.opencontainers.image.documentation="https://www.ibm.com/support/knowledgecenter/SSAW57_liberty/com.ibm.websphere.wlp.nd.multiplatform.doc/ae/cwlp_about.html" \ + 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'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" \ + vendor="IBM" \ + name="IBM WebSphere Liberty" \ + version="$LIBERTY_VERSION" \ + summary="Image for WebSphere Liberty with IBM's Java and Red Hat's UBI 8" \ + 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" + +ENV PATH=$PATH:/opt/ibm/wlp/bin:/opt/ibm/helpers/build + +# Add labels for consumption by IBM Product Insights +LABEL "ProductID"="fbf6a96d49214c0abc6a3bc5da6e48cd" \ + "ProductName"="WebSphere Application Server Liberty" \ + "ProductVersion"="$LIBERTY_VERSION" \ + "BuildLabel"="$LIBERTY_BUILD_LABEL" + # Add default user 1001 and create wlp with right user/permissions before copying RUN adduser -u 1001 -r -g root -s /usr/sbin/nologin default \ && mkdir -p /opt/ibm/wlp \ diff --git a/ga/23.0.0.12/kernel/Dockerfile.ubi.openjdk11 b/ga/23.0.0.12/kernel/Dockerfile.ubi.openjdk11 index f6d13bc7..8ceaff64 100644 --- a/ga/23.0.0.12/kernel/Dockerfile.ubi.openjdk11 +++ b/ga/23.0.0.12/kernel/Dockerfile.ubi.openjdk11 @@ -48,28 +48,6 @@ ARG OPENJ9_SCC=true ARG LIBERTY_VERSION=23.0.0.12 ARG LIBERTY_BUILD_LABEL=replace_with_gm_driver_label -LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Thomas Watson, Wendy Raschke, Michal Broz" \ - org.opencontainers.image.vendor="IBM" \ - org.opencontainers.image.url="https://github.com/WASdev/ci.docker" \ - org.opencontainers.image.documentation="https://www.ibm.com/support/knowledgecenter/SSAW57_liberty/com.ibm.websphere.wlp.nd.multiplatform.doc/ae/cwlp_about.html" \ - 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 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" \ - vendor="IBM" \ - name="IBM WebSphere Liberty" \ - version="$LIBERTY_VERSION" \ - summary="Image for WebSphere Liberty with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and Red Hat's UBI 8" \ - 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" - -ENV PATH=$PATH:/opt/ibm/wlp/bin:/opt/ibm/helpers/build - -# Add labels for consumption by IBM Product Insights -LABEL "ProductID"="fbf6a96d49214c0abc6a3bc5da6e48cd" \ - "ProductName"="WebSphere Application Server Liberty" \ - "ProductVersion"="$LIBERTY_VERSION" \ - "BuildLabel"="$LIBERTY_BUILD_LABEL" - # Install dumb-init RUN set -eux; \ ARCH="$(uname -m)"; \ @@ -99,6 +77,28 @@ RUN set -eux; \ echo "${DUMB_INIT_SHA256} */usr/bin/dumb-init" | sha256sum -c -; \ chmod +x /usr/bin/dumb-init; +LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Thomas Watson, Wendy Raschke, Michal Broz" \ + org.opencontainers.image.vendor="IBM" \ + org.opencontainers.image.url="https://github.com/WASdev/ci.docker" \ + org.opencontainers.image.documentation="https://www.ibm.com/support/knowledgecenter/SSAW57_liberty/com.ibm.websphere.wlp.nd.multiplatform.doc/ae/cwlp_about.html" \ + 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 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" \ + vendor="IBM" \ + name="IBM WebSphere Liberty" \ + version="$LIBERTY_VERSION" \ + summary="Image for WebSphere Liberty with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and Red Hat's UBI 8" \ + 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" + +ENV PATH=$PATH:/opt/ibm/wlp/bin:/opt/ibm/helpers/build + +# Add labels for consumption by IBM Product Insights +LABEL "ProductID"="fbf6a96d49214c0abc6a3bc5da6e48cd" \ + "ProductName"="WebSphere Application Server Liberty" \ + "ProductVersion"="$LIBERTY_VERSION" \ + "BuildLabel"="$LIBERTY_BUILD_LABEL" + # Add default user 1001 and create wlp with right user/permissions before copying RUN adduser -u 1001 -r -g root -s /usr/sbin/nologin default \ && mkdir -p /opt/ibm/wlp \ diff --git a/ga/23.0.0.12/kernel/Dockerfile.ubi.openjdk17 b/ga/23.0.0.12/kernel/Dockerfile.ubi.openjdk17 index a9b1527d..72b10ff8 100644 --- a/ga/23.0.0.12/kernel/Dockerfile.ubi.openjdk17 +++ b/ga/23.0.0.12/kernel/Dockerfile.ubi.openjdk17 @@ -48,28 +48,6 @@ ARG OPENJ9_SCC=true ARG LIBERTY_VERSION=23.0.0.12 ARG LIBERTY_BUILD_LABEL=replace_with_gm_driver_label -LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Thomas Watson, Wendy Raschke, Michal Broz" \ - org.opencontainers.image.vendor="IBM" \ - org.opencontainers.image.url="https://github.com/WASdev/ci.docker" \ - org.opencontainers.image.documentation="https://www.ibm.com/support/knowledgecenter/SSAW57_liberty/com.ibm.websphere.wlp.nd.multiplatform.doc/ae/cwlp_about.html" \ - 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 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" \ - vendor="IBM" \ - name="IBM WebSphere Liberty" \ - version="$LIBERTY_VERSION" \ - summary="Image for WebSphere Liberty with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and Red Hat's UBI 8" \ - 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" - -ENV PATH=$PATH:/opt/ibm/wlp/bin:/opt/ibm/helpers/build - -# Add labels for consumption by IBM Product Insights -LABEL "ProductID"="fbf6a96d49214c0abc6a3bc5da6e48cd" \ - "ProductName"="WebSphere Application Server Liberty" \ - "ProductVersion"="$LIBERTY_VERSION" \ - "BuildLabel"="$LIBERTY_BUILD_LABEL" - # Install dumb-init RUN set -eux; \ ARCH="$(uname -m)"; \ @@ -99,6 +77,28 @@ RUN set -eux; \ echo "${DUMB_INIT_SHA256} */usr/bin/dumb-init" | sha256sum -c -; \ chmod +x /usr/bin/dumb-init; +LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Thomas Watson, Wendy Raschke, Michal Broz" \ + org.opencontainers.image.vendor="IBM" \ + org.opencontainers.image.url="https://github.com/WASdev/ci.docker" \ + org.opencontainers.image.documentation="https://www.ibm.com/support/knowledgecenter/SSAW57_liberty/com.ibm.websphere.wlp.nd.multiplatform.doc/ae/cwlp_about.html" \ + 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 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" \ + vendor="IBM" \ + name="IBM WebSphere Liberty" \ + version="$LIBERTY_VERSION" \ + summary="Image for WebSphere Liberty with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and Red Hat's UBI 8" \ + 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" + +ENV PATH=$PATH:/opt/ibm/wlp/bin:/opt/ibm/helpers/build + +# Add labels for consumption by IBM Product Insights +LABEL "ProductID"="fbf6a96d49214c0abc6a3bc5da6e48cd" \ + "ProductName"="WebSphere Application Server Liberty" \ + "ProductVersion"="$LIBERTY_VERSION" \ + "BuildLabel"="$LIBERTY_BUILD_LABEL" + # Add default user 1001 and create wlp with right user/permissions before copying RUN adduser -u 1001 -r -g root -s /usr/sbin/nologin default \ && mkdir -p /opt/ibm/wlp \ diff --git a/ga/23.0.0.12/kernel/Dockerfile.ubi.openjdk8 b/ga/23.0.0.12/kernel/Dockerfile.ubi.openjdk8 index bfb6b7e9..27c66111 100644 --- a/ga/23.0.0.12/kernel/Dockerfile.ubi.openjdk8 +++ b/ga/23.0.0.12/kernel/Dockerfile.ubi.openjdk8 @@ -48,28 +48,6 @@ ARG OPENJ9_SCC=true ARG LIBERTY_VERSION=23.0.0.12 ARG LIBERTY_BUILD_LABEL=replace_with_gm_driver_label -LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Thomas Watson, Wendy Raschke, Michal Broz" \ - org.opencontainers.image.vendor="IBM" \ - org.opencontainers.image.url="https://github.com/WASdev/ci.docker" \ - org.opencontainers.image.documentation="https://www.ibm.com/support/knowledgecenter/SSAW57_liberty/com.ibm.websphere.wlp.nd.multiplatform.doc/ae/cwlp_about.html" \ - 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 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" \ - vendor="IBM" \ - name="IBM WebSphere Liberty" \ - version="$LIBERTY_VERSION" \ - summary="Image for WebSphere Liberty with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and Red Hat's UBI 8" \ - 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" - -ENV PATH=$PATH:/opt/ibm/wlp/bin:/opt/ibm/helpers/build - -# Add labels for consumption by IBM Product Insights -LABEL "ProductID"="fbf6a96d49214c0abc6a3bc5da6e48cd" \ - "ProductName"="WebSphere Application Server Liberty" \ - "ProductVersion"="$LIBERTY_VERSION" \ - "BuildLabel"="$LIBERTY_BUILD_LABEL" - # Install dumb-init RUN set -eux; \ ARCH="$(uname -m)"; \ @@ -99,6 +77,28 @@ RUN set -eux; \ echo "${DUMB_INIT_SHA256} */usr/bin/dumb-init" | sha256sum -c -; \ chmod +x /usr/bin/dumb-init; +LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Thomas Watson, Wendy Raschke, Michal Broz" \ + org.opencontainers.image.vendor="IBM" \ + org.opencontainers.image.url="https://github.com/WASdev/ci.docker" \ + org.opencontainers.image.documentation="https://www.ibm.com/support/knowledgecenter/SSAW57_liberty/com.ibm.websphere.wlp.nd.multiplatform.doc/ae/cwlp_about.html" \ + 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 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" \ + vendor="IBM" \ + name="IBM WebSphere Liberty" \ + version="$LIBERTY_VERSION" \ + summary="Image for WebSphere Liberty with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and Red Hat's UBI 8" \ + 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" + +ENV PATH=$PATH:/opt/ibm/wlp/bin:/opt/ibm/helpers/build + +# Add labels for consumption by IBM Product Insights +LABEL "ProductID"="fbf6a96d49214c0abc6a3bc5da6e48cd" \ + "ProductName"="WebSphere Application Server Liberty" \ + "ProductVersion"="$LIBERTY_VERSION" \ + "BuildLabel"="$LIBERTY_BUILD_LABEL" + # Add default user 1001 and create wlp with right user/permissions before copying RUN adduser -u 1001 -r -g root -s /usr/sbin/nologin default \ && mkdir -p /opt/ibm/wlp \ diff --git a/ga/23.0.0.12/kernel/Dockerfile.ubuntu.ibmjava8 b/ga/23.0.0.12/kernel/Dockerfile.ubuntu.ibmjava8 index a55ebe80..af9004f0 100644 --- a/ga/23.0.0.12/kernel/Dockerfile.ubuntu.ibmjava8 +++ b/ga/23.0.0.12/kernel/Dockerfile.ubuntu.ibmjava8 @@ -22,23 +22,6 @@ ARG OPENJ9_SCC=true ARG LIBERTY_VERSION=23.0.0.12 ARG LIBERTY_BUILD_LABEL=replace_with_gm_driver_label -LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Thomas Watson, Wendy Raschke, Michal Broz" \ - org.opencontainers.image.vendor="IBM" \ - org.opencontainers.image.url="https://github.com/WASdev/ci.docker" \ - org.opencontainers.image.documentation="https://www.ibm.com/support/knowledgecenter/SSAW57_liberty/com.ibm.websphere.wlp.nd.multiplatform.doc/ae/cwlp_about.html" \ - 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" - -ENV PATH=$PATH:/opt/ibm/wlp/bin:/opt/ibm/helpers/build - -# Add labels for consumption by IBM Product Insights -LABEL "ProductID"="fbf6a96d49214c0abc6a3bc5da6e48cd" \ - "ProductName"="WebSphere Application Server Liberty" \ - "ProductVersion"="$LIBERTY_VERSION" \ - "BuildLabel"="$LIBERTY_BUILD_LABEL" - # Install dumb-init RUN set -eux; \ apt-get update; \ @@ -72,6 +55,23 @@ RUN set -eux; \ apt-get purge --auto-remove -y curl; \ rm -rf /var/lib/apt/lists/*; +LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Thomas Watson, Wendy Raschke, Michal Broz" \ + org.opencontainers.image.vendor="IBM" \ + org.opencontainers.image.url="https://github.com/WASdev/ci.docker" \ + org.opencontainers.image.documentation="https://www.ibm.com/support/knowledgecenter/SSAW57_liberty/com.ibm.websphere.wlp.nd.multiplatform.doc/ae/cwlp_about.html" \ + 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" + +ENV PATH=$PATH:/opt/ibm/wlp/bin:/opt/ibm/helpers/build + +# Add labels for consumption by IBM Product Insights +LABEL "ProductID"="fbf6a96d49214c0abc6a3bc5da6e48cd" \ + "ProductName"="WebSphere Application Server Liberty" \ + "ProductVersion"="$LIBERTY_VERSION" \ + "BuildLabel"="$LIBERTY_BUILD_LABEL" + # Install WebSphere Liberty ARG LIBERTY_URL ARG DOWNLOAD_OPTIONS="" diff --git a/ga/23.0.0.12/kernel/Dockerfile.ubuntu.openjdk11 b/ga/23.0.0.12/kernel/Dockerfile.ubuntu.openjdk11 index f826e9d9..d7177475 100644 --- a/ga/23.0.0.12/kernel/Dockerfile.ubuntu.openjdk11 +++ b/ga/23.0.0.12/kernel/Dockerfile.ubuntu.openjdk11 @@ -22,23 +22,6 @@ ARG OPENJ9_SCC=true ARG LIBERTY_VERSION=23.0.0.12 ARG LIBERTY_BUILD_LABEL=replace_with_gm_driver_label -LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Thomas Watson, Wendy Raschke, Michal Broz" \ - org.opencontainers.image.vendor="IBM" \ - org.opencontainers.image.url="https://github.com/WASdev/ci.docker" \ - org.opencontainers.image.documentation="https://www.ibm.com/support/knowledgecenter/SSAW57_liberty/com.ibm.websphere.wlp.nd.multiplatform.doc/ae/cwlp_about.html" \ - 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" - -ENV PATH=$PATH:/opt/ibm/wlp/bin:/opt/ibm/helpers/build - -# Add labels for consumption by IBM Product Insights -LABEL "ProductID"="fbf6a96d49214c0abc6a3bc5da6e48cd" \ - "ProductName"="WebSphere Application Server Liberty" \ - "ProductVersion"="$LIBERTY_VERSION" \ - "BuildLabel"="$LIBERTY_BUILD_LABEL" - # Install dumb-init RUN set -eux; \ ARCH="$(dpkg --print-architecture)"; \ @@ -68,6 +51,23 @@ RUN set -eux; \ echo "${DUMB_INIT_SHA256} */usr/bin/dumb-init" | sha256sum -c -; \ chmod +x /usr/bin/dumb-init; +LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Thomas Watson, Wendy Raschke, Michal Broz" \ + org.opencontainers.image.vendor="IBM" \ + org.opencontainers.image.url="https://github.com/WASdev/ci.docker" \ + org.opencontainers.image.documentation="https://www.ibm.com/support/knowledgecenter/SSAW57_liberty/com.ibm.websphere.wlp.nd.multiplatform.doc/ae/cwlp_about.html" \ + 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" + +ENV PATH=$PATH:/opt/ibm/wlp/bin:/opt/ibm/helpers/build + +# Add labels for consumption by IBM Product Insights +LABEL "ProductID"="fbf6a96d49214c0abc6a3bc5da6e48cd" \ + "ProductName"="WebSphere Application Server Liberty" \ + "ProductVersion"="$LIBERTY_VERSION" \ + "BuildLabel"="$LIBERTY_BUILD_LABEL" + # Install WebSphere Liberty ARG LIBERTY_URL ARG DOWNLOAD_OPTIONS="" diff --git a/ga/23.0.0.12/kernel/Dockerfile.ubuntu.openjdk17 b/ga/23.0.0.12/kernel/Dockerfile.ubuntu.openjdk17 index 8c63a681..96b586fc 100644 --- a/ga/23.0.0.12/kernel/Dockerfile.ubuntu.openjdk17 +++ b/ga/23.0.0.12/kernel/Dockerfile.ubuntu.openjdk17 @@ -22,23 +22,6 @@ ARG OPENJ9_SCC=true ARG LIBERTY_VERSION=23.0.0.12 ARG LIBERTY_BUILD_LABEL=replace_with_gm_driver_label -LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Thomas Watson, Wendy Raschke, Michal Broz" \ - org.opencontainers.image.vendor="IBM" \ - org.opencontainers.image.url="https://github.com/WASdev/ci.docker" \ - org.opencontainers.image.documentation="https://www.ibm.com/support/knowledgecenter/SSAW57_liberty/com.ibm.websphere.wlp.nd.multiplatform.doc/ae/cwlp_about.html" \ - 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" - -ENV PATH=$PATH:/opt/ibm/wlp/bin:/opt/ibm/helpers/build - -# Add labels for consumption by IBM Product Insights -LABEL "ProductID"="fbf6a96d49214c0abc6a3bc5da6e48cd" \ - "ProductName"="WebSphere Application Server Liberty" \ - "ProductVersion"="$LIBERTY_VERSION" \ - "BuildLabel"="$LIBERTY_BUILD_LABEL" - # Install dumb-init RUN set -eux; \ ARCH="$(dpkg --print-architecture)"; \ @@ -68,6 +51,23 @@ RUN set -eux; \ echo "${DUMB_INIT_SHA256} */usr/bin/dumb-init" | sha256sum -c -; \ chmod +x /usr/bin/dumb-init; +LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Thomas Watson, Wendy Raschke, Michal Broz" \ + org.opencontainers.image.vendor="IBM" \ + org.opencontainers.image.url="https://github.com/WASdev/ci.docker" \ + org.opencontainers.image.documentation="https://www.ibm.com/support/knowledgecenter/SSAW57_liberty/com.ibm.websphere.wlp.nd.multiplatform.doc/ae/cwlp_about.html" \ + 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" + +ENV PATH=$PATH:/opt/ibm/wlp/bin:/opt/ibm/helpers/build + +# Add labels for consumption by IBM Product Insights +LABEL "ProductID"="fbf6a96d49214c0abc6a3bc5da6e48cd" \ + "ProductName"="WebSphere Application Server Liberty" \ + "ProductVersion"="$LIBERTY_VERSION" \ + "BuildLabel"="$LIBERTY_BUILD_LABEL" + # Install WebSphere Liberty ARG LIBERTY_URL ARG DOWNLOAD_OPTIONS="" diff --git a/ga/23.0.0.9/kernel/Dockerfile.ubi.ibmjava8 b/ga/23.0.0.9/kernel/Dockerfile.ubi.ibmjava8 index a9b70836..dadcab1d 100644 --- a/ga/23.0.0.9/kernel/Dockerfile.ubi.ibmjava8 +++ b/ga/23.0.0.9/kernel/Dockerfile.ubi.ibmjava8 @@ -48,28 +48,6 @@ ARG OPENJ9_SCC=true ARG LIBERTY_VERSION=23.0.0.9 ARG LIBERTY_BUILD_LABEL=cl230920230904-1158 -LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Thomas Watson, Wendy Raschke, Michal Broz" \ - org.opencontainers.image.vendor="IBM" \ - org.opencontainers.image.url="https://github.com/WASdev/ci.docker" \ - org.opencontainers.image.documentation="https://www.ibm.com/support/knowledgecenter/SSAW57_liberty/com.ibm.websphere.wlp.nd.multiplatform.doc/ae/cwlp_about.html" \ - 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'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" \ - vendor="IBM" \ - name="IBM WebSphere Liberty" \ - version="$LIBERTY_VERSION" \ - summary="Image for WebSphere Liberty with IBM's Java and Red Hat's UBI 8" \ - 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" - -ENV PATH=$PATH:/opt/ibm/wlp/bin:/opt/ibm/helpers/build - -# Add labels for consumption by IBM Product Insights -LABEL "ProductID"="fbf6a96d49214c0abc6a3bc5da6e48cd" \ - "ProductName"="WebSphere Application Server Liberty" \ - "ProductVersion"="$LIBERTY_VERSION" \ - "BuildLabel"="$LIBERTY_BUILD_LABEL" - # Install dumb-init RUN set -eux; \ ARCH="$(uname -m)"; \ @@ -99,6 +77,28 @@ RUN set -eux; \ echo "${DUMB_INIT_SHA256} */usr/bin/dumb-init" | sha256sum -c -; \ chmod +x /usr/bin/dumb-init; +LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Thomas Watson, Wendy Raschke, Michal Broz" \ + org.opencontainers.image.vendor="IBM" \ + org.opencontainers.image.url="https://github.com/WASdev/ci.docker" \ + org.opencontainers.image.documentation="https://www.ibm.com/support/knowledgecenter/SSAW57_liberty/com.ibm.websphere.wlp.nd.multiplatform.doc/ae/cwlp_about.html" \ + 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'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" \ + vendor="IBM" \ + name="IBM WebSphere Liberty" \ + version="$LIBERTY_VERSION" \ + summary="Image for WebSphere Liberty with IBM's Java and Red Hat's UBI 8" \ + 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" + +ENV PATH=$PATH:/opt/ibm/wlp/bin:/opt/ibm/helpers/build + +# Add labels for consumption by IBM Product Insights +LABEL "ProductID"="fbf6a96d49214c0abc6a3bc5da6e48cd" \ + "ProductName"="WebSphere Application Server Liberty" \ + "ProductVersion"="$LIBERTY_VERSION" \ + "BuildLabel"="$LIBERTY_BUILD_LABEL" + # Add default user 1001 and create wlp with right user/permissions before copying RUN adduser -u 1001 -r -g root -s /usr/sbin/nologin default \ && mkdir -p /opt/ibm/wlp \ diff --git a/ga/23.0.0.9/kernel/Dockerfile.ubi.openjdk11 b/ga/23.0.0.9/kernel/Dockerfile.ubi.openjdk11 index b607741b..2e22f497 100644 --- a/ga/23.0.0.9/kernel/Dockerfile.ubi.openjdk11 +++ b/ga/23.0.0.9/kernel/Dockerfile.ubi.openjdk11 @@ -48,28 +48,6 @@ ARG OPENJ9_SCC=true ARG LIBERTY_VERSION=23.0.0.9 ARG LIBERTY_BUILD_LABEL=cl230920230904-1158 -LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Thomas Watson, Wendy Raschke, Michal Broz" \ - org.opencontainers.image.vendor="IBM" \ - org.opencontainers.image.url="https://github.com/WASdev/ci.docker" \ - org.opencontainers.image.documentation="https://www.ibm.com/support/knowledgecenter/SSAW57_liberty/com.ibm.websphere.wlp.nd.multiplatform.doc/ae/cwlp_about.html" \ - 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 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" \ - vendor="IBM" \ - name="IBM WebSphere Liberty" \ - version="$LIBERTY_VERSION" \ - summary="Image for WebSphere Liberty with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and Red Hat's UBI 8" \ - 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" - -ENV PATH=$PATH:/opt/ibm/wlp/bin:/opt/ibm/helpers/build - -# Add labels for consumption by IBM Product Insights -LABEL "ProductID"="fbf6a96d49214c0abc6a3bc5da6e48cd" \ - "ProductName"="WebSphere Application Server Liberty" \ - "ProductVersion"="$LIBERTY_VERSION" \ - "BuildLabel"="$LIBERTY_BUILD_LABEL" - # Install dumb-init RUN set -eux; \ ARCH="$(uname -m)"; \ @@ -99,6 +77,28 @@ RUN set -eux; \ echo "${DUMB_INIT_SHA256} */usr/bin/dumb-init" | sha256sum -c -; \ chmod +x /usr/bin/dumb-init; +LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Thomas Watson, Wendy Raschke, Michal Broz" \ + org.opencontainers.image.vendor="IBM" \ + org.opencontainers.image.url="https://github.com/WASdev/ci.docker" \ + org.opencontainers.image.documentation="https://www.ibm.com/support/knowledgecenter/SSAW57_liberty/com.ibm.websphere.wlp.nd.multiplatform.doc/ae/cwlp_about.html" \ + 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 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" \ + vendor="IBM" \ + name="IBM WebSphere Liberty" \ + version="$LIBERTY_VERSION" \ + summary="Image for WebSphere Liberty with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and Red Hat's UBI 8" \ + 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" + +ENV PATH=$PATH:/opt/ibm/wlp/bin:/opt/ibm/helpers/build + +# Add labels for consumption by IBM Product Insights +LABEL "ProductID"="fbf6a96d49214c0abc6a3bc5da6e48cd" \ + "ProductName"="WebSphere Application Server Liberty" \ + "ProductVersion"="$LIBERTY_VERSION" \ + "BuildLabel"="$LIBERTY_BUILD_LABEL" + # Add default user 1001 and create wlp with right user/permissions before copying RUN adduser -u 1001 -r -g root -s /usr/sbin/nologin default \ && mkdir -p /opt/ibm/wlp \ diff --git a/ga/23.0.0.9/kernel/Dockerfile.ubi.openjdk17 b/ga/23.0.0.9/kernel/Dockerfile.ubi.openjdk17 index 4e948af1..e9166600 100644 --- a/ga/23.0.0.9/kernel/Dockerfile.ubi.openjdk17 +++ b/ga/23.0.0.9/kernel/Dockerfile.ubi.openjdk17 @@ -48,28 +48,6 @@ ARG OPENJ9_SCC=true ARG LIBERTY_VERSION=23.0.0.9 ARG LIBERTY_BUILD_LABEL=cl230920230904-1158 -LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Thomas Watson, Wendy Raschke, Michal Broz" \ - org.opencontainers.image.vendor="IBM" \ - org.opencontainers.image.url="https://github.com/WASdev/ci.docker" \ - org.opencontainers.image.documentation="https://www.ibm.com/support/knowledgecenter/SSAW57_liberty/com.ibm.websphere.wlp.nd.multiplatform.doc/ae/cwlp_about.html" \ - 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 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" \ - vendor="IBM" \ - name="IBM WebSphere Liberty" \ - version="$LIBERTY_VERSION" \ - summary="Image for WebSphere Liberty with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and Red Hat's UBI 8" \ - 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" - -ENV PATH=$PATH:/opt/ibm/wlp/bin:/opt/ibm/helpers/build - -# Add labels for consumption by IBM Product Insights -LABEL "ProductID"="fbf6a96d49214c0abc6a3bc5da6e48cd" \ - "ProductName"="WebSphere Application Server Liberty" \ - "ProductVersion"="$LIBERTY_VERSION" \ - "BuildLabel"="$LIBERTY_BUILD_LABEL" - # Install dumb-init RUN set -eux; \ ARCH="$(uname -m)"; \ @@ -99,6 +77,28 @@ RUN set -eux; \ echo "${DUMB_INIT_SHA256} */usr/bin/dumb-init" | sha256sum -c -; \ chmod +x /usr/bin/dumb-init; +LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Thomas Watson, Wendy Raschke, Michal Broz" \ + org.opencontainers.image.vendor="IBM" \ + org.opencontainers.image.url="https://github.com/WASdev/ci.docker" \ + org.opencontainers.image.documentation="https://www.ibm.com/support/knowledgecenter/SSAW57_liberty/com.ibm.websphere.wlp.nd.multiplatform.doc/ae/cwlp_about.html" \ + 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 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" \ + vendor="IBM" \ + name="IBM WebSphere Liberty" \ + version="$LIBERTY_VERSION" \ + summary="Image for WebSphere Liberty with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and Red Hat's UBI 8" \ + 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" + +ENV PATH=$PATH:/opt/ibm/wlp/bin:/opt/ibm/helpers/build + +# Add labels for consumption by IBM Product Insights +LABEL "ProductID"="fbf6a96d49214c0abc6a3bc5da6e48cd" \ + "ProductName"="WebSphere Application Server Liberty" \ + "ProductVersion"="$LIBERTY_VERSION" \ + "BuildLabel"="$LIBERTY_BUILD_LABEL" + # Add default user 1001 and create wlp with right user/permissions before copying RUN adduser -u 1001 -r -g root -s /usr/sbin/nologin default \ && mkdir -p /opt/ibm/wlp \ diff --git a/ga/23.0.0.9/kernel/Dockerfile.ubi.openjdk8 b/ga/23.0.0.9/kernel/Dockerfile.ubi.openjdk8 index 98ba4446..fb03d745 100644 --- a/ga/23.0.0.9/kernel/Dockerfile.ubi.openjdk8 +++ b/ga/23.0.0.9/kernel/Dockerfile.ubi.openjdk8 @@ -48,28 +48,6 @@ ARG OPENJ9_SCC=true ARG LIBERTY_VERSION=23.0.0.9 ARG LIBERTY_BUILD_LABEL=cl230920230904-1158 -LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Thomas Watson, Wendy Raschke, Michal Broz" \ - org.opencontainers.image.vendor="IBM" \ - org.opencontainers.image.url="https://github.com/WASdev/ci.docker" \ - org.opencontainers.image.documentation="https://www.ibm.com/support/knowledgecenter/SSAW57_liberty/com.ibm.websphere.wlp.nd.multiplatform.doc/ae/cwlp_about.html" \ - 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 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" \ - vendor="IBM" \ - name="IBM WebSphere Liberty" \ - version="$LIBERTY_VERSION" \ - summary="Image for WebSphere Liberty with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and Red Hat's UBI 8" \ - 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" - -ENV PATH=$PATH:/opt/ibm/wlp/bin:/opt/ibm/helpers/build - -# Add labels for consumption by IBM Product Insights -LABEL "ProductID"="fbf6a96d49214c0abc6a3bc5da6e48cd" \ - "ProductName"="WebSphere Application Server Liberty" \ - "ProductVersion"="$LIBERTY_VERSION" \ - "BuildLabel"="$LIBERTY_BUILD_LABEL" - # Install dumb-init RUN set -eux; \ ARCH="$(uname -m)"; \ @@ -99,6 +77,28 @@ RUN set -eux; \ echo "${DUMB_INIT_SHA256} */usr/bin/dumb-init" | sha256sum -c -; \ chmod +x /usr/bin/dumb-init; +LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Thomas Watson, Wendy Raschke, Michal Broz" \ + org.opencontainers.image.vendor="IBM" \ + org.opencontainers.image.url="https://github.com/WASdev/ci.docker" \ + org.opencontainers.image.documentation="https://www.ibm.com/support/knowledgecenter/SSAW57_liberty/com.ibm.websphere.wlp.nd.multiplatform.doc/ae/cwlp_about.html" \ + 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 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" \ + vendor="IBM" \ + name="IBM WebSphere Liberty" \ + version="$LIBERTY_VERSION" \ + summary="Image for WebSphere Liberty with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and Red Hat's UBI 8" \ + 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" + +ENV PATH=$PATH:/opt/ibm/wlp/bin:/opt/ibm/helpers/build + +# Add labels for consumption by IBM Product Insights +LABEL "ProductID"="fbf6a96d49214c0abc6a3bc5da6e48cd" \ + "ProductName"="WebSphere Application Server Liberty" \ + "ProductVersion"="$LIBERTY_VERSION" \ + "BuildLabel"="$LIBERTY_BUILD_LABEL" + # Add default user 1001 and create wlp with right user/permissions before copying RUN adduser -u 1001 -r -g root -s /usr/sbin/nologin default \ && mkdir -p /opt/ibm/wlp \ diff --git a/ga/23.0.0.9/kernel/Dockerfile.ubuntu.ibmjava8 b/ga/23.0.0.9/kernel/Dockerfile.ubuntu.ibmjava8 index 27b0e54d..afbf27e1 100644 --- a/ga/23.0.0.9/kernel/Dockerfile.ubuntu.ibmjava8 +++ b/ga/23.0.0.9/kernel/Dockerfile.ubuntu.ibmjava8 @@ -22,23 +22,6 @@ ARG OPENJ9_SCC=true ARG LIBERTY_VERSION=23.0.0.9 ARG LIBERTY_BUILD_LABEL=cl230920230904-1158 -LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Thomas Watson, Wendy Raschke, Michal Broz" \ - org.opencontainers.image.vendor="IBM" \ - org.opencontainers.image.url="https://github.com/WASdev/ci.docker" \ - org.opencontainers.image.documentation="https://www.ibm.com/support/knowledgecenter/SSAW57_liberty/com.ibm.websphere.wlp.nd.multiplatform.doc/ae/cwlp_about.html" \ - 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" - -ENV PATH=$PATH:/opt/ibm/wlp/bin:/opt/ibm/helpers/build - -# Add labels for consumption by IBM Product Insights -LABEL "ProductID"="fbf6a96d49214c0abc6a3bc5da6e48cd" \ - "ProductName"="WebSphere Application Server Liberty" \ - "ProductVersion"="$LIBERTY_VERSION" \ - "BuildLabel"="$LIBERTY_BUILD_LABEL" - # Install dumb-init RUN set -eux; \ apt-get update; \ @@ -72,6 +55,23 @@ RUN set -eux; \ apt-get purge --auto-remove -y curl; \ rm -rf /var/lib/apt/lists/*; +LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Thomas Watson, Wendy Raschke, Michal Broz" \ + org.opencontainers.image.vendor="IBM" \ + org.opencontainers.image.url="https://github.com/WASdev/ci.docker" \ + org.opencontainers.image.documentation="https://www.ibm.com/support/knowledgecenter/SSAW57_liberty/com.ibm.websphere.wlp.nd.multiplatform.doc/ae/cwlp_about.html" \ + 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" + +ENV PATH=$PATH:/opt/ibm/wlp/bin:/opt/ibm/helpers/build + +# Add labels for consumption by IBM Product Insights +LABEL "ProductID"="fbf6a96d49214c0abc6a3bc5da6e48cd" \ + "ProductName"="WebSphere Application Server Liberty" \ + "ProductVersion"="$LIBERTY_VERSION" \ + "BuildLabel"="$LIBERTY_BUILD_LABEL" + # Install WebSphere Liberty ARG LIBERTY_URL ARG DOWNLOAD_OPTIONS="" diff --git a/ga/23.0.0.9/kernel/Dockerfile.ubuntu.openjdk11 b/ga/23.0.0.9/kernel/Dockerfile.ubuntu.openjdk11 index 851e49da..399bdee1 100644 --- a/ga/23.0.0.9/kernel/Dockerfile.ubuntu.openjdk11 +++ b/ga/23.0.0.9/kernel/Dockerfile.ubuntu.openjdk11 @@ -22,23 +22,6 @@ ARG OPENJ9_SCC=true ARG LIBERTY_VERSION=23.0.0.9 ARG LIBERTY_BUILD_LABEL=cl230920230904-1158 -LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Thomas Watson, Wendy Raschke, Michal Broz" \ - org.opencontainers.image.vendor="IBM" \ - org.opencontainers.image.url="https://github.com/WASdev/ci.docker" \ - org.opencontainers.image.documentation="https://www.ibm.com/support/knowledgecenter/SSAW57_liberty/com.ibm.websphere.wlp.nd.multiplatform.doc/ae/cwlp_about.html" \ - 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" - -ENV PATH=$PATH:/opt/ibm/wlp/bin:/opt/ibm/helpers/build - -# Add labels for consumption by IBM Product Insights -LABEL "ProductID"="fbf6a96d49214c0abc6a3bc5da6e48cd" \ - "ProductName"="WebSphere Application Server Liberty" \ - "ProductVersion"="$LIBERTY_VERSION" \ - "BuildLabel"="$LIBERTY_BUILD_LABEL" - # Install dumb-init RUN set -eux; \ ARCH="$(dpkg --print-architecture)"; \ @@ -68,6 +51,23 @@ RUN set -eux; \ echo "${DUMB_INIT_SHA256} */usr/bin/dumb-init" | sha256sum -c -; \ chmod +x /usr/bin/dumb-init; +LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Thomas Watson, Wendy Raschke, Michal Broz" \ + org.opencontainers.image.vendor="IBM" \ + org.opencontainers.image.url="https://github.com/WASdev/ci.docker" \ + org.opencontainers.image.documentation="https://www.ibm.com/support/knowledgecenter/SSAW57_liberty/com.ibm.websphere.wlp.nd.multiplatform.doc/ae/cwlp_about.html" \ + 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" + +ENV PATH=$PATH:/opt/ibm/wlp/bin:/opt/ibm/helpers/build + +# Add labels for consumption by IBM Product Insights +LABEL "ProductID"="fbf6a96d49214c0abc6a3bc5da6e48cd" \ + "ProductName"="WebSphere Application Server Liberty" \ + "ProductVersion"="$LIBERTY_VERSION" \ + "BuildLabel"="$LIBERTY_BUILD_LABEL" + # Install WebSphere Liberty ARG LIBERTY_URL ARG DOWNLOAD_OPTIONS="" diff --git a/ga/23.0.0.9/kernel/Dockerfile.ubuntu.openjdk17 b/ga/23.0.0.9/kernel/Dockerfile.ubuntu.openjdk17 index 2c317aea..5821f1cc 100644 --- a/ga/23.0.0.9/kernel/Dockerfile.ubuntu.openjdk17 +++ b/ga/23.0.0.9/kernel/Dockerfile.ubuntu.openjdk17 @@ -22,23 +22,6 @@ ARG OPENJ9_SCC=true ARG LIBERTY_VERSION=23.0.0.9 ARG LIBERTY_BUILD_LABEL=cl230920230904-1158 -LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Thomas Watson, Wendy Raschke, Michal Broz" \ - org.opencontainers.image.vendor="IBM" \ - org.opencontainers.image.url="https://github.com/WASdev/ci.docker" \ - org.opencontainers.image.documentation="https://www.ibm.com/support/knowledgecenter/SSAW57_liberty/com.ibm.websphere.wlp.nd.multiplatform.doc/ae/cwlp_about.html" \ - 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" - -ENV PATH=$PATH:/opt/ibm/wlp/bin:/opt/ibm/helpers/build - -# Add labels for consumption by IBM Product Insights -LABEL "ProductID"="fbf6a96d49214c0abc6a3bc5da6e48cd" \ - "ProductName"="WebSphere Application Server Liberty" \ - "ProductVersion"="$LIBERTY_VERSION" \ - "BuildLabel"="$LIBERTY_BUILD_LABEL" - # Install dumb-init RUN set -eux; \ ARCH="$(dpkg --print-architecture)"; \ @@ -68,6 +51,23 @@ RUN set -eux; \ echo "${DUMB_INIT_SHA256} */usr/bin/dumb-init" | sha256sum -c -; \ chmod +x /usr/bin/dumb-init; +LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Thomas Watson, Wendy Raschke, Michal Broz" \ + org.opencontainers.image.vendor="IBM" \ + org.opencontainers.image.url="https://github.com/WASdev/ci.docker" \ + org.opencontainers.image.documentation="https://www.ibm.com/support/knowledgecenter/SSAW57_liberty/com.ibm.websphere.wlp.nd.multiplatform.doc/ae/cwlp_about.html" \ + 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" + +ENV PATH=$PATH:/opt/ibm/wlp/bin:/opt/ibm/helpers/build + +# Add labels for consumption by IBM Product Insights +LABEL "ProductID"="fbf6a96d49214c0abc6a3bc5da6e48cd" \ + "ProductName"="WebSphere Application Server Liberty" \ + "ProductVersion"="$LIBERTY_VERSION" \ + "BuildLabel"="$LIBERTY_BUILD_LABEL" + # Install WebSphere Liberty ARG LIBERTY_URL ARG DOWNLOAD_OPTIONS="" diff --git a/ga/latest/kernel/Dockerfile.ubi.ibmjava8 b/ga/latest/kernel/Dockerfile.ubi.ibmjava8 index baac67fe..56e16614 100644 --- a/ga/latest/kernel/Dockerfile.ubi.ibmjava8 +++ b/ga/latest/kernel/Dockerfile.ubi.ibmjava8 @@ -48,28 +48,6 @@ ARG OPENJ9_SCC=true ARG LIBERTY_VERSION=23.0.0.12 ARG LIBERTY_BUILD_LABEL=replace_with_gm_driver_label -LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Thomas Watson, Wendy Raschke, Michal Broz" \ - org.opencontainers.image.vendor="IBM" \ - org.opencontainers.image.url="https://github.com/WASdev/ci.docker" \ - org.opencontainers.image.documentation="https://www.ibm.com/support/knowledgecenter/SSAW57_liberty/com.ibm.websphere.wlp.nd.multiplatform.doc/ae/cwlp_about.html" \ - 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'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" \ - vendor="IBM" \ - name="IBM WebSphere Liberty" \ - version="$LIBERTY_VERSION" \ - summary="Image for WebSphere Liberty with IBM's Java and Red Hat's UBI 8" \ - 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" - -ENV PATH=$PATH:/opt/ibm/wlp/bin:/opt/ibm/helpers/build - -# Add labels for consumption by IBM Product Insights -LABEL "ProductID"="fbf6a96d49214c0abc6a3bc5da6e48cd" \ - "ProductName"="WebSphere Application Server Liberty" \ - "ProductVersion"="$LIBERTY_VERSION" \ - "BuildLabel"="$LIBERTY_BUILD_LABEL" - # Install dumb-init RUN set -eux; \ ARCH="$(uname -m)"; \ @@ -99,6 +77,28 @@ RUN set -eux; \ echo "${DUMB_INIT_SHA256} */usr/bin/dumb-init" | sha256sum -c -; \ chmod +x /usr/bin/dumb-init; +LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Thomas Watson, Wendy Raschke, Michal Broz" \ + org.opencontainers.image.vendor="IBM" \ + org.opencontainers.image.url="https://github.com/WASdev/ci.docker" \ + org.opencontainers.image.documentation="https://www.ibm.com/support/knowledgecenter/SSAW57_liberty/com.ibm.websphere.wlp.nd.multiplatform.doc/ae/cwlp_about.html" \ + 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'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" \ + vendor="IBM" \ + name="IBM WebSphere Liberty" \ + version="$LIBERTY_VERSION" \ + summary="Image for WebSphere Liberty with IBM's Java and Red Hat's UBI 8" \ + 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" + +ENV PATH=$PATH:/opt/ibm/wlp/bin:/opt/ibm/helpers/build + +# Add labels for consumption by IBM Product Insights +LABEL "ProductID"="fbf6a96d49214c0abc6a3bc5da6e48cd" \ + "ProductName"="WebSphere Application Server Liberty" \ + "ProductVersion"="$LIBERTY_VERSION" \ + "BuildLabel"="$LIBERTY_BUILD_LABEL" + # Add default user 1001 and create wlp with right user/permissions before copying RUN adduser -u 1001 -r -g root -s /usr/sbin/nologin default \ && mkdir -p /opt/ibm/wlp \ diff --git a/ga/latest/kernel/Dockerfile.ubi.openjdk11 b/ga/latest/kernel/Dockerfile.ubi.openjdk11 index f6d13bc7..8ceaff64 100644 --- a/ga/latest/kernel/Dockerfile.ubi.openjdk11 +++ b/ga/latest/kernel/Dockerfile.ubi.openjdk11 @@ -48,28 +48,6 @@ ARG OPENJ9_SCC=true ARG LIBERTY_VERSION=23.0.0.12 ARG LIBERTY_BUILD_LABEL=replace_with_gm_driver_label -LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Thomas Watson, Wendy Raschke, Michal Broz" \ - org.opencontainers.image.vendor="IBM" \ - org.opencontainers.image.url="https://github.com/WASdev/ci.docker" \ - org.opencontainers.image.documentation="https://www.ibm.com/support/knowledgecenter/SSAW57_liberty/com.ibm.websphere.wlp.nd.multiplatform.doc/ae/cwlp_about.html" \ - 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 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" \ - vendor="IBM" \ - name="IBM WebSphere Liberty" \ - version="$LIBERTY_VERSION" \ - summary="Image for WebSphere Liberty with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and Red Hat's UBI 8" \ - 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" - -ENV PATH=$PATH:/opt/ibm/wlp/bin:/opt/ibm/helpers/build - -# Add labels for consumption by IBM Product Insights -LABEL "ProductID"="fbf6a96d49214c0abc6a3bc5da6e48cd" \ - "ProductName"="WebSphere Application Server Liberty" \ - "ProductVersion"="$LIBERTY_VERSION" \ - "BuildLabel"="$LIBERTY_BUILD_LABEL" - # Install dumb-init RUN set -eux; \ ARCH="$(uname -m)"; \ @@ -99,6 +77,28 @@ RUN set -eux; \ echo "${DUMB_INIT_SHA256} */usr/bin/dumb-init" | sha256sum -c -; \ chmod +x /usr/bin/dumb-init; +LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Thomas Watson, Wendy Raschke, Michal Broz" \ + org.opencontainers.image.vendor="IBM" \ + org.opencontainers.image.url="https://github.com/WASdev/ci.docker" \ + org.opencontainers.image.documentation="https://www.ibm.com/support/knowledgecenter/SSAW57_liberty/com.ibm.websphere.wlp.nd.multiplatform.doc/ae/cwlp_about.html" \ + 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 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" \ + vendor="IBM" \ + name="IBM WebSphere Liberty" \ + version="$LIBERTY_VERSION" \ + summary="Image for WebSphere Liberty with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and Red Hat's UBI 8" \ + 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" + +ENV PATH=$PATH:/opt/ibm/wlp/bin:/opt/ibm/helpers/build + +# Add labels for consumption by IBM Product Insights +LABEL "ProductID"="fbf6a96d49214c0abc6a3bc5da6e48cd" \ + "ProductName"="WebSphere Application Server Liberty" \ + "ProductVersion"="$LIBERTY_VERSION" \ + "BuildLabel"="$LIBERTY_BUILD_LABEL" + # Add default user 1001 and create wlp with right user/permissions before copying RUN adduser -u 1001 -r -g root -s /usr/sbin/nologin default \ && mkdir -p /opt/ibm/wlp \ diff --git a/ga/latest/kernel/Dockerfile.ubi.openjdk17 b/ga/latest/kernel/Dockerfile.ubi.openjdk17 index a9b1527d..72b10ff8 100644 --- a/ga/latest/kernel/Dockerfile.ubi.openjdk17 +++ b/ga/latest/kernel/Dockerfile.ubi.openjdk17 @@ -48,28 +48,6 @@ ARG OPENJ9_SCC=true ARG LIBERTY_VERSION=23.0.0.12 ARG LIBERTY_BUILD_LABEL=replace_with_gm_driver_label -LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Thomas Watson, Wendy Raschke, Michal Broz" \ - org.opencontainers.image.vendor="IBM" \ - org.opencontainers.image.url="https://github.com/WASdev/ci.docker" \ - org.opencontainers.image.documentation="https://www.ibm.com/support/knowledgecenter/SSAW57_liberty/com.ibm.websphere.wlp.nd.multiplatform.doc/ae/cwlp_about.html" \ - 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 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" \ - vendor="IBM" \ - name="IBM WebSphere Liberty" \ - version="$LIBERTY_VERSION" \ - summary="Image for WebSphere Liberty with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and Red Hat's UBI 8" \ - 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" - -ENV PATH=$PATH:/opt/ibm/wlp/bin:/opt/ibm/helpers/build - -# Add labels for consumption by IBM Product Insights -LABEL "ProductID"="fbf6a96d49214c0abc6a3bc5da6e48cd" \ - "ProductName"="WebSphere Application Server Liberty" \ - "ProductVersion"="$LIBERTY_VERSION" \ - "BuildLabel"="$LIBERTY_BUILD_LABEL" - # Install dumb-init RUN set -eux; \ ARCH="$(uname -m)"; \ @@ -99,6 +77,28 @@ RUN set -eux; \ echo "${DUMB_INIT_SHA256} */usr/bin/dumb-init" | sha256sum -c -; \ chmod +x /usr/bin/dumb-init; +LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Thomas Watson, Wendy Raschke, Michal Broz" \ + org.opencontainers.image.vendor="IBM" \ + org.opencontainers.image.url="https://github.com/WASdev/ci.docker" \ + org.opencontainers.image.documentation="https://www.ibm.com/support/knowledgecenter/SSAW57_liberty/com.ibm.websphere.wlp.nd.multiplatform.doc/ae/cwlp_about.html" \ + 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 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" \ + vendor="IBM" \ + name="IBM WebSphere Liberty" \ + version="$LIBERTY_VERSION" \ + summary="Image for WebSphere Liberty with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and Red Hat's UBI 8" \ + 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" + +ENV PATH=$PATH:/opt/ibm/wlp/bin:/opt/ibm/helpers/build + +# Add labels for consumption by IBM Product Insights +LABEL "ProductID"="fbf6a96d49214c0abc6a3bc5da6e48cd" \ + "ProductName"="WebSphere Application Server Liberty" \ + "ProductVersion"="$LIBERTY_VERSION" \ + "BuildLabel"="$LIBERTY_BUILD_LABEL" + # Add default user 1001 and create wlp with right user/permissions before copying RUN adduser -u 1001 -r -g root -s /usr/sbin/nologin default \ && mkdir -p /opt/ibm/wlp \ diff --git a/ga/latest/kernel/Dockerfile.ubi.openjdk8 b/ga/latest/kernel/Dockerfile.ubi.openjdk8 index bfb6b7e9..27c66111 100644 --- a/ga/latest/kernel/Dockerfile.ubi.openjdk8 +++ b/ga/latest/kernel/Dockerfile.ubi.openjdk8 @@ -48,28 +48,6 @@ ARG OPENJ9_SCC=true ARG LIBERTY_VERSION=23.0.0.12 ARG LIBERTY_BUILD_LABEL=replace_with_gm_driver_label -LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Thomas Watson, Wendy Raschke, Michal Broz" \ - org.opencontainers.image.vendor="IBM" \ - org.opencontainers.image.url="https://github.com/WASdev/ci.docker" \ - org.opencontainers.image.documentation="https://www.ibm.com/support/knowledgecenter/SSAW57_liberty/com.ibm.websphere.wlp.nd.multiplatform.doc/ae/cwlp_about.html" \ - 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 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" \ - vendor="IBM" \ - name="IBM WebSphere Liberty" \ - version="$LIBERTY_VERSION" \ - summary="Image for WebSphere Liberty with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and Red Hat's UBI 8" \ - 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" - -ENV PATH=$PATH:/opt/ibm/wlp/bin:/opt/ibm/helpers/build - -# Add labels for consumption by IBM Product Insights -LABEL "ProductID"="fbf6a96d49214c0abc6a3bc5da6e48cd" \ - "ProductName"="WebSphere Application Server Liberty" \ - "ProductVersion"="$LIBERTY_VERSION" \ - "BuildLabel"="$LIBERTY_BUILD_LABEL" - # Install dumb-init RUN set -eux; \ ARCH="$(uname -m)"; \ @@ -99,6 +77,28 @@ RUN set -eux; \ echo "${DUMB_INIT_SHA256} */usr/bin/dumb-init" | sha256sum -c -; \ chmod +x /usr/bin/dumb-init; +LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Thomas Watson, Wendy Raschke, Michal Broz" \ + org.opencontainers.image.vendor="IBM" \ + org.opencontainers.image.url="https://github.com/WASdev/ci.docker" \ + org.opencontainers.image.documentation="https://www.ibm.com/support/knowledgecenter/SSAW57_liberty/com.ibm.websphere.wlp.nd.multiplatform.doc/ae/cwlp_about.html" \ + 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 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" \ + vendor="IBM" \ + name="IBM WebSphere Liberty" \ + version="$LIBERTY_VERSION" \ + summary="Image for WebSphere Liberty with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and Red Hat's UBI 8" \ + 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" + +ENV PATH=$PATH:/opt/ibm/wlp/bin:/opt/ibm/helpers/build + +# Add labels for consumption by IBM Product Insights +LABEL "ProductID"="fbf6a96d49214c0abc6a3bc5da6e48cd" \ + "ProductName"="WebSphere Application Server Liberty" \ + "ProductVersion"="$LIBERTY_VERSION" \ + "BuildLabel"="$LIBERTY_BUILD_LABEL" + # Add default user 1001 and create wlp with right user/permissions before copying RUN adduser -u 1001 -r -g root -s /usr/sbin/nologin default \ && mkdir -p /opt/ibm/wlp \ diff --git a/ga/latest/kernel/Dockerfile.ubuntu.ibmjava8 b/ga/latest/kernel/Dockerfile.ubuntu.ibmjava8 index a55ebe80..af9004f0 100644 --- a/ga/latest/kernel/Dockerfile.ubuntu.ibmjava8 +++ b/ga/latest/kernel/Dockerfile.ubuntu.ibmjava8 @@ -22,23 +22,6 @@ ARG OPENJ9_SCC=true ARG LIBERTY_VERSION=23.0.0.12 ARG LIBERTY_BUILD_LABEL=replace_with_gm_driver_label -LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Thomas Watson, Wendy Raschke, Michal Broz" \ - org.opencontainers.image.vendor="IBM" \ - org.opencontainers.image.url="https://github.com/WASdev/ci.docker" \ - org.opencontainers.image.documentation="https://www.ibm.com/support/knowledgecenter/SSAW57_liberty/com.ibm.websphere.wlp.nd.multiplatform.doc/ae/cwlp_about.html" \ - 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" - -ENV PATH=$PATH:/opt/ibm/wlp/bin:/opt/ibm/helpers/build - -# Add labels for consumption by IBM Product Insights -LABEL "ProductID"="fbf6a96d49214c0abc6a3bc5da6e48cd" \ - "ProductName"="WebSphere Application Server Liberty" \ - "ProductVersion"="$LIBERTY_VERSION" \ - "BuildLabel"="$LIBERTY_BUILD_LABEL" - # Install dumb-init RUN set -eux; \ apt-get update; \ @@ -72,6 +55,23 @@ RUN set -eux; \ apt-get purge --auto-remove -y curl; \ rm -rf /var/lib/apt/lists/*; +LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Thomas Watson, Wendy Raschke, Michal Broz" \ + org.opencontainers.image.vendor="IBM" \ + org.opencontainers.image.url="https://github.com/WASdev/ci.docker" \ + org.opencontainers.image.documentation="https://www.ibm.com/support/knowledgecenter/SSAW57_liberty/com.ibm.websphere.wlp.nd.multiplatform.doc/ae/cwlp_about.html" \ + 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" + +ENV PATH=$PATH:/opt/ibm/wlp/bin:/opt/ibm/helpers/build + +# Add labels for consumption by IBM Product Insights +LABEL "ProductID"="fbf6a96d49214c0abc6a3bc5da6e48cd" \ + "ProductName"="WebSphere Application Server Liberty" \ + "ProductVersion"="$LIBERTY_VERSION" \ + "BuildLabel"="$LIBERTY_BUILD_LABEL" + # Install WebSphere Liberty ARG LIBERTY_URL ARG DOWNLOAD_OPTIONS="" diff --git a/ga/latest/kernel/Dockerfile.ubuntu.openjdk11 b/ga/latest/kernel/Dockerfile.ubuntu.openjdk11 index f826e9d9..d7177475 100644 --- a/ga/latest/kernel/Dockerfile.ubuntu.openjdk11 +++ b/ga/latest/kernel/Dockerfile.ubuntu.openjdk11 @@ -22,23 +22,6 @@ ARG OPENJ9_SCC=true ARG LIBERTY_VERSION=23.0.0.12 ARG LIBERTY_BUILD_LABEL=replace_with_gm_driver_label -LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Thomas Watson, Wendy Raschke, Michal Broz" \ - org.opencontainers.image.vendor="IBM" \ - org.opencontainers.image.url="https://github.com/WASdev/ci.docker" \ - org.opencontainers.image.documentation="https://www.ibm.com/support/knowledgecenter/SSAW57_liberty/com.ibm.websphere.wlp.nd.multiplatform.doc/ae/cwlp_about.html" \ - 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" - -ENV PATH=$PATH:/opt/ibm/wlp/bin:/opt/ibm/helpers/build - -# Add labels for consumption by IBM Product Insights -LABEL "ProductID"="fbf6a96d49214c0abc6a3bc5da6e48cd" \ - "ProductName"="WebSphere Application Server Liberty" \ - "ProductVersion"="$LIBERTY_VERSION" \ - "BuildLabel"="$LIBERTY_BUILD_LABEL" - # Install dumb-init RUN set -eux; \ ARCH="$(dpkg --print-architecture)"; \ @@ -68,6 +51,23 @@ RUN set -eux; \ echo "${DUMB_INIT_SHA256} */usr/bin/dumb-init" | sha256sum -c -; \ chmod +x /usr/bin/dumb-init; +LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Thomas Watson, Wendy Raschke, Michal Broz" \ + org.opencontainers.image.vendor="IBM" \ + org.opencontainers.image.url="https://github.com/WASdev/ci.docker" \ + org.opencontainers.image.documentation="https://www.ibm.com/support/knowledgecenter/SSAW57_liberty/com.ibm.websphere.wlp.nd.multiplatform.doc/ae/cwlp_about.html" \ + 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" + +ENV PATH=$PATH:/opt/ibm/wlp/bin:/opt/ibm/helpers/build + +# Add labels for consumption by IBM Product Insights +LABEL "ProductID"="fbf6a96d49214c0abc6a3bc5da6e48cd" \ + "ProductName"="WebSphere Application Server Liberty" \ + "ProductVersion"="$LIBERTY_VERSION" \ + "BuildLabel"="$LIBERTY_BUILD_LABEL" + # Install WebSphere Liberty ARG LIBERTY_URL ARG DOWNLOAD_OPTIONS="" diff --git a/ga/latest/kernel/Dockerfile.ubuntu.openjdk17 b/ga/latest/kernel/Dockerfile.ubuntu.openjdk17 index 8c63a681..96b586fc 100644 --- a/ga/latest/kernel/Dockerfile.ubuntu.openjdk17 +++ b/ga/latest/kernel/Dockerfile.ubuntu.openjdk17 @@ -22,23 +22,6 @@ ARG OPENJ9_SCC=true ARG LIBERTY_VERSION=23.0.0.12 ARG LIBERTY_BUILD_LABEL=replace_with_gm_driver_label -LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Thomas Watson, Wendy Raschke, Michal Broz" \ - org.opencontainers.image.vendor="IBM" \ - org.opencontainers.image.url="https://github.com/WASdev/ci.docker" \ - org.opencontainers.image.documentation="https://www.ibm.com/support/knowledgecenter/SSAW57_liberty/com.ibm.websphere.wlp.nd.multiplatform.doc/ae/cwlp_about.html" \ - 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" - -ENV PATH=$PATH:/opt/ibm/wlp/bin:/opt/ibm/helpers/build - -# Add labels for consumption by IBM Product Insights -LABEL "ProductID"="fbf6a96d49214c0abc6a3bc5da6e48cd" \ - "ProductName"="WebSphere Application Server Liberty" \ - "ProductVersion"="$LIBERTY_VERSION" \ - "BuildLabel"="$LIBERTY_BUILD_LABEL" - # Install dumb-init RUN set -eux; \ ARCH="$(dpkg --print-architecture)"; \ @@ -68,6 +51,23 @@ RUN set -eux; \ echo "${DUMB_INIT_SHA256} */usr/bin/dumb-init" | sha256sum -c -; \ chmod +x /usr/bin/dumb-init; +LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Thomas Watson, Wendy Raschke, Michal Broz" \ + org.opencontainers.image.vendor="IBM" \ + org.opencontainers.image.url="https://github.com/WASdev/ci.docker" \ + org.opencontainers.image.documentation="https://www.ibm.com/support/knowledgecenter/SSAW57_liberty/com.ibm.websphere.wlp.nd.multiplatform.doc/ae/cwlp_about.html" \ + 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" + +ENV PATH=$PATH:/opt/ibm/wlp/bin:/opt/ibm/helpers/build + +# Add labels for consumption by IBM Product Insights +LABEL "ProductID"="fbf6a96d49214c0abc6a3bc5da6e48cd" \ + "ProductName"="WebSphere Application Server Liberty" \ + "ProductVersion"="$LIBERTY_VERSION" \ + "BuildLabel"="$LIBERTY_BUILD_LABEL" + # Install WebSphere Liberty ARG LIBERTY_URL ARG DOWNLOAD_OPTIONS=""