Move label/env after dumb-init (vNext)

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 \

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 \

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 \

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 \

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=""