From 0186b17342b23dc1056c8f0a8f82fd6450660186 Mon Sep 17 00:00:00 2001 From: kabicin Date: Wed, 6 Dec 2023 09:14:06 -0500 Subject: [PATCH] Move label after dumb-init --- .../23.0.0.12/full/Dockerfile.ubi.ibmjava8 | 24 +++++++++---------- .../23.0.0.12/full/Dockerfile.ubi.openjdk11 | 24 +++++++++---------- .../23.0.0.12/full/Dockerfile.ubi.openjdk17 | 24 +++++++++---------- .../23.0.0.12/full/Dockerfile.ubi.openjdk8 | 24 +++++++++---------- .../full/Dockerfile.ubuntu.openjdk11 | 18 +++++++------- .../full/Dockerfile.ubuntu.openjdk17 | 18 +++++++------- .../23.0.0.12/full/Dockerfile.ubuntu.openjdk8 | 18 +++++++------- .../kernel-slim/Dockerfile.ubi.ibmjava8 | 24 +++++++++---------- .../kernel-slim/Dockerfile.ubi.openjdk11 | 24 +++++++++---------- .../kernel-slim/Dockerfile.ubi.openjdk17 | 24 +++++++++---------- .../kernel-slim/Dockerfile.ubi.openjdk8 | 24 +++++++++---------- .../kernel-slim/Dockerfile.ubuntu.openjdk11 | 18 +++++++------- .../kernel-slim/Dockerfile.ubuntu.openjdk17 | 18 +++++++------- .../kernel-slim/Dockerfile.ubuntu.openjdk8 | 18 +++++++------- .../23.0.0.9/full/Dockerfile.ubi.ibmjava8 | 24 +++++++++---------- .../23.0.0.9/full/Dockerfile.ubi.openjdk11 | 24 +++++++++---------- .../23.0.0.9/full/Dockerfile.ubi.openjdk17 | 24 +++++++++---------- .../23.0.0.9/full/Dockerfile.ubi.openjdk8 | 24 +++++++++---------- .../23.0.0.9/full/Dockerfile.ubuntu.openjdk11 | 18 +++++++------- .../23.0.0.9/full/Dockerfile.ubuntu.openjdk17 | 18 +++++++------- .../23.0.0.9/full/Dockerfile.ubuntu.openjdk8 | 18 +++++++------- .../kernel-slim/Dockerfile.ubi.ibmjava8 | 24 +++++++++---------- .../kernel-slim/Dockerfile.ubi.openjdk11 | 24 +++++++++---------- .../kernel-slim/Dockerfile.ubi.openjdk17 | 24 +++++++++---------- .../kernel-slim/Dockerfile.ubi.openjdk8 | 24 +++++++++---------- .../kernel-slim/Dockerfile.ubuntu.openjdk11 | 18 +++++++------- .../kernel-slim/Dockerfile.ubuntu.openjdk17 | 18 +++++++------- .../kernel-slim/Dockerfile.ubuntu.openjdk8 | 18 +++++++------- releases/latest/beta/Dockerfile.ubi.openjdk17 | 24 +++++++++---------- .../latest/beta/Dockerfile.ubuntu.openjdk11 | 18 +++++++------- .../latest/beta/Dockerfile.ubuntu.openjdk17 | 18 +++++++------- .../latest/beta/Dockerfile.ubuntu.openjdk8 | 18 +++++++------- releases/latest/full/Dockerfile.ubi.ibmjava8 | 24 +++++++++---------- releases/latest/full/Dockerfile.ubi.openjdk11 | 24 +++++++++---------- releases/latest/full/Dockerfile.ubi.openjdk17 | 24 +++++++++---------- releases/latest/full/Dockerfile.ubi.openjdk8 | 24 +++++++++---------- .../latest/full/Dockerfile.ubuntu.openjdk11 | 18 +++++++------- .../latest/full/Dockerfile.ubuntu.openjdk17 | 18 +++++++------- .../latest/full/Dockerfile.ubuntu.openjdk8 | 18 +++++++------- .../kernel-slim/Dockerfile.ubi.ibmjava8 | 24 +++++++++---------- .../kernel-slim/Dockerfile.ubi.openjdk11 | 24 +++++++++---------- .../kernel-slim/Dockerfile.ubi.openjdk17 | 24 +++++++++---------- .../kernel-slim/Dockerfile.ubi.openjdk8 | 24 +++++++++---------- .../kernel-slim/Dockerfile.ubuntu.openjdk11 | 18 +++++++------- .../kernel-slim/Dockerfile.ubuntu.openjdk17 | 18 +++++++------- .../kernel-slim/Dockerfile.ubuntu.openjdk8 | 18 +++++++------- 46 files changed, 489 insertions(+), 489 deletions(-) diff --git a/releases/23.0.0.12/full/Dockerfile.ubi.ibmjava8 b/releases/23.0.0.12/full/Dockerfile.ubi.ibmjava8 index 48c29a05f..af2a1727a 100644 --- a/releases/23.0.0.12/full/Dockerfile.ubi.ibmjava8 +++ b/releases/23.0.0.12/full/Dockerfile.ubi.ibmjava8 @@ -34,18 +34,6 @@ ARG LIBERTY_BUILD_LABEL=replace_with_gm_driver_label ARG OPENJ9_SCC=true ARG VERBOSE=false -LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Melissa Lee, Thomas Watson, Michal Broz, Wendy Raschke" \ - org.opencontainers.image.vendor="Open Liberty" \ - org.opencontainers.image.url="https://openliberty.io/" \ - org.opencontainers.image.source="https://github.com/OpenLiberty/ci.docker" \ - org.opencontainers.image.version="$LIBERTY_VERSION" \ - org.opencontainers.image.revision="$LIBERTY_BUILD_LABEL" \ - vendor="Open Liberty" \ - name="Open Liberty" \ - version="$LIBERTY_VERSION" \ - summary="Image for Open Liberty with IBM's Java and UBI 8" \ - description="This image contains the Open Liberty runtime with IBM's Java and Red Hat UBI 8 as the base OS. For more information on this image please see https://github.com/OpenLiberty/ci.docker#building-an-application-image" - COPY NOTICES /opt/ol/NOTICES COPY helpers /opt/ol/helpers COPY fixes/ /opt/ol/fixes/ @@ -79,6 +67,18 @@ 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, Melissa Lee, Thomas Watson, Michal Broz, Wendy Raschke" \ + org.opencontainers.image.vendor="Open Liberty" \ + org.opencontainers.image.url="https://openliberty.io/" \ + org.opencontainers.image.source="https://github.com/OpenLiberty/ci.docker" \ + org.opencontainers.image.version="$LIBERTY_VERSION" \ + org.opencontainers.image.revision="$LIBERTY_BUILD_LABEL" \ + vendor="Open Liberty" \ + name="Open Liberty" \ + version="$LIBERTY_VERSION" \ + summary="Image for Open Liberty with IBM's Java and UBI 8" \ + description="This image contains the Open Liberty runtime with IBM's Java and Red Hat UBI 8 as the base OS. For more information on this image please see https://github.com/OpenLiberty/ci.docker#building-an-application-image" + # 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/ol/wlp \ diff --git a/releases/23.0.0.12/full/Dockerfile.ubi.openjdk11 b/releases/23.0.0.12/full/Dockerfile.ubi.openjdk11 index 39d7cfb22..782f5268e 100644 --- a/releases/23.0.0.12/full/Dockerfile.ubi.openjdk11 +++ b/releases/23.0.0.12/full/Dockerfile.ubi.openjdk11 @@ -34,18 +34,6 @@ ARG LIBERTY_BUILD_LABEL=replace_with_gm_driver_label ARG OPENJ9_SCC=true ARG VERBOSE=false -LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Melissa Lee, Thomas Watson, Michal Broz, Wendy Raschke" \ - org.opencontainers.image.vendor="Open Liberty" \ - org.opencontainers.image.url="https://openliberty.io/" \ - org.opencontainers.image.source="https://github.com/OpenLiberty/ci.docker" \ - org.opencontainers.image.version="$LIBERTY_VERSION" \ - org.opencontainers.image.revision="$LIBERTY_BUILD_LABEL" \ - vendor="Open Liberty" \ - name="Open Liberty" \ - version="$LIBERTY_VERSION" \ - summary="Image for Open Liberty with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and UBI 8" \ - description="This image contains the Open Liberty runtime with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and Red Hat UBI 8 as the base OS. For more information on this image please see https://github.com/OpenLiberty/ci.docker#building-an-application-image" - COPY NOTICES /opt/ol/NOTICES COPY helpers /opt/ol/helpers COPY fixes/ /opt/ol/fixes/ @@ -79,6 +67,18 @@ 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, Melissa Lee, Thomas Watson, Michal Broz, Wendy Raschke" \ + org.opencontainers.image.vendor="Open Liberty" \ + org.opencontainers.image.url="https://openliberty.io/" \ + org.opencontainers.image.source="https://github.com/OpenLiberty/ci.docker" \ + org.opencontainers.image.version="$LIBERTY_VERSION" \ + org.opencontainers.image.revision="$LIBERTY_BUILD_LABEL" \ + vendor="Open Liberty" \ + name="Open Liberty" \ + version="$LIBERTY_VERSION" \ + summary="Image for Open Liberty with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and UBI 8" \ + description="This image contains the Open Liberty runtime with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and Red Hat UBI 8 as the base OS. For more information on this image please see https://github.com/OpenLiberty/ci.docker#building-an-application-image" + # 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/ol/wlp \ diff --git a/releases/23.0.0.12/full/Dockerfile.ubi.openjdk17 b/releases/23.0.0.12/full/Dockerfile.ubi.openjdk17 index 506ceeab3..e8852e62d 100644 --- a/releases/23.0.0.12/full/Dockerfile.ubi.openjdk17 +++ b/releases/23.0.0.12/full/Dockerfile.ubi.openjdk17 @@ -34,18 +34,6 @@ ARG LIBERTY_BUILD_LABEL=replace_with_gm_driver_label ARG OPENJ9_SCC=true ARG VERBOSE=false -LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Melissa Lee, Thomas Watson, Michal Broz, Wendy Raschke" \ - org.opencontainers.image.vendor="Open Liberty" \ - org.opencontainers.image.url="https://openliberty.io/" \ - org.opencontainers.image.source="https://github.com/OpenLiberty/ci.docker" \ - org.opencontainers.image.version="$LIBERTY_VERSION" \ - org.opencontainers.image.revision="$LIBERTY_BUILD_LABEL" \ - vendor="Open Liberty" \ - name="Open Liberty" \ - version="$LIBERTY_VERSION" \ - summary="Image for Open Liberty with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and UBI 8" \ - description="This image contains the Open Liberty runtime with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and Red Hat UBI 8 as the base OS. For more information on this image please see https://github.com/OpenLiberty/ci.docker#building-an-application-image" - COPY NOTICES /opt/ol/NOTICES COPY helpers /opt/ol/helpers COPY fixes/ /opt/ol/fixes/ @@ -79,6 +67,18 @@ 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, Melissa Lee, Thomas Watson, Michal Broz, Wendy Raschke" \ + org.opencontainers.image.vendor="Open Liberty" \ + org.opencontainers.image.url="https://openliberty.io/" \ + org.opencontainers.image.source="https://github.com/OpenLiberty/ci.docker" \ + org.opencontainers.image.version="$LIBERTY_VERSION" \ + org.opencontainers.image.revision="$LIBERTY_BUILD_LABEL" \ + vendor="Open Liberty" \ + name="Open Liberty" \ + version="$LIBERTY_VERSION" \ + summary="Image for Open Liberty with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and UBI 8" \ + description="This image contains the Open Liberty runtime with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and Red Hat UBI 8 as the base OS. For more information on this image please see https://github.com/OpenLiberty/ci.docker#building-an-application-image" + # 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/ol/wlp \ diff --git a/releases/23.0.0.12/full/Dockerfile.ubi.openjdk8 b/releases/23.0.0.12/full/Dockerfile.ubi.openjdk8 index 668537447..f19b30c3a 100644 --- a/releases/23.0.0.12/full/Dockerfile.ubi.openjdk8 +++ b/releases/23.0.0.12/full/Dockerfile.ubi.openjdk8 @@ -34,18 +34,6 @@ ARG LIBERTY_BUILD_LABEL=replace_with_gm_driver_label ARG OPENJ9_SCC=true ARG VERBOSE=false -LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Melissa Lee, Thomas Watson, Michal Broz, Wendy Raschke" \ - org.opencontainers.image.vendor="Open Liberty" \ - org.opencontainers.image.url="https://openliberty.io/" \ - org.opencontainers.image.source="https://github.com/OpenLiberty/ci.docker" \ - org.opencontainers.image.version="$LIBERTY_VERSION" \ - org.opencontainers.image.revision="$LIBERTY_BUILD_LABEL" \ - vendor="Open Liberty" \ - name="Open Liberty" \ - version="$LIBERTY_VERSION" \ - summary="Image for Open Liberty with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and UBI 8" \ - description="This image contains the Open Liberty runtime with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and Red Hat UBI 8 as the base OS. For more information on this image please see https://github.com/OpenLiberty/ci.docker#building-an-application-image" - COPY NOTICES /opt/ol/NOTICES COPY helpers /opt/ol/helpers COPY fixes/ /opt/ol/fixes/ @@ -79,6 +67,18 @@ 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, Melissa Lee, Thomas Watson, Michal Broz, Wendy Raschke" \ + org.opencontainers.image.vendor="Open Liberty" \ + org.opencontainers.image.url="https://openliberty.io/" \ + org.opencontainers.image.source="https://github.com/OpenLiberty/ci.docker" \ + org.opencontainers.image.version="$LIBERTY_VERSION" \ + org.opencontainers.image.revision="$LIBERTY_BUILD_LABEL" \ + vendor="Open Liberty" \ + name="Open Liberty" \ + version="$LIBERTY_VERSION" \ + summary="Image for Open Liberty with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and UBI 8" \ + description="This image contains the Open Liberty runtime with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and Red Hat UBI 8 as the base OS. For more information on this image please see https://github.com/OpenLiberty/ci.docker#building-an-application-image" + # 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/ol/wlp \ diff --git a/releases/23.0.0.12/full/Dockerfile.ubuntu.openjdk11 b/releases/23.0.0.12/full/Dockerfile.ubuntu.openjdk11 index 86fa09a42..1b54a406b 100644 --- a/releases/23.0.0.12/full/Dockerfile.ubuntu.openjdk11 +++ b/releases/23.0.0.12/full/Dockerfile.ubuntu.openjdk11 @@ -10,15 +10,6 @@ ARG LIBERTY_BUILD_LABEL=replace_with_gm_driver_label ARG OPENJ9_SCC=true ARG VERBOSE=false -LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Melissa Lee, Thomas Watson, Michal Broz, Wendy Raschke" \ - org.opencontainers.image.vendor="Open Liberty" \ - org.opencontainers.image.url="https://openliberty.io/" \ - org.opencontainers.image.source="https://github.com/OpenLiberty/ci.docker" \ - org.opencontainers.image.revision="$LIBERTY_BUILD_LABEL" \ - org.opencontainers.image.description="This image contains the Open 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://github.com/OpenLiberty/ci.docker#building-an-application-image" \ - org.opencontainers.image.title="Open Liberty" \ - org.opencontainers.image.version="$LIBERTY_VERSION" - COPY NOTICES /opt/ol/NOTICES COPY helpers /opt/ol/helpers COPY fixes/ /opt/ol/fixes/ @@ -52,6 +43,15 @@ 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, Melissa Lee, Thomas Watson, Michal Broz, Wendy Raschke" \ + org.opencontainers.image.vendor="Open Liberty" \ + org.opencontainers.image.url="https://openliberty.io/" \ + org.opencontainers.image.source="https://github.com/OpenLiberty/ci.docker" \ + org.opencontainers.image.revision="$LIBERTY_BUILD_LABEL" \ + org.opencontainers.image.description="This image contains the Open 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://github.com/OpenLiberty/ci.docker#building-an-application-image" \ + org.opencontainers.image.title="Open Liberty" \ + org.opencontainers.image.version="$LIBERTY_VERSION" + # Install Open Liberty RUN apt-get update \ && apt-get install -y --no-install-recommends unzip openssl wget \ diff --git a/releases/23.0.0.12/full/Dockerfile.ubuntu.openjdk17 b/releases/23.0.0.12/full/Dockerfile.ubuntu.openjdk17 index 9c8776549..1b42ecd4d 100644 --- a/releases/23.0.0.12/full/Dockerfile.ubuntu.openjdk17 +++ b/releases/23.0.0.12/full/Dockerfile.ubuntu.openjdk17 @@ -10,15 +10,6 @@ ARG LIBERTY_BUILD_LABEL=replace_with_gm_driver_label ARG OPENJ9_SCC=true ARG VERBOSE=false -LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Melissa Lee, Thomas Watson, Michal Broz, Wendy Raschke" \ - org.opencontainers.image.vendor="Open Liberty" \ - org.opencontainers.image.url="https://openliberty.io/" \ - org.opencontainers.image.source="https://github.com/OpenLiberty/ci.docker" \ - org.opencontainers.image.revision="$LIBERTY_BUILD_LABEL" \ - org.opencontainers.image.description="This image contains the Open 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://github.com/OpenLiberty/ci.docker#building-an-application-image" \ - org.opencontainers.image.title="Open Liberty" \ - org.opencontainers.image.version="$LIBERTY_VERSION" - COPY NOTICES /opt/ol/NOTICES COPY helpers /opt/ol/helpers COPY fixes/ /opt/ol/fixes/ @@ -52,6 +43,15 @@ 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, Melissa Lee, Thomas Watson, Michal Broz, Wendy Raschke" \ + org.opencontainers.image.vendor="Open Liberty" \ + org.opencontainers.image.url="https://openliberty.io/" \ + org.opencontainers.image.source="https://github.com/OpenLiberty/ci.docker" \ + org.opencontainers.image.revision="$LIBERTY_BUILD_LABEL" \ + org.opencontainers.image.description="This image contains the Open 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://github.com/OpenLiberty/ci.docker#building-an-application-image" \ + org.opencontainers.image.title="Open Liberty" \ + org.opencontainers.image.version="$LIBERTY_VERSION" + # Install Open Liberty RUN apt-get update \ && apt-get install -y --no-install-recommends unzip openssl wget \ diff --git a/releases/23.0.0.12/full/Dockerfile.ubuntu.openjdk8 b/releases/23.0.0.12/full/Dockerfile.ubuntu.openjdk8 index dc5dd87af..9ad909dec 100644 --- a/releases/23.0.0.12/full/Dockerfile.ubuntu.openjdk8 +++ b/releases/23.0.0.12/full/Dockerfile.ubuntu.openjdk8 @@ -10,15 +10,6 @@ ARG LIBERTY_BUILD_LABEL=replace_with_gm_driver_label ARG OPENJ9_SCC=true ARG VERBOSE=false -LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Melissa Lee, Thomas Watson, Michal Broz, Wendy Raschke" \ - org.opencontainers.image.vendor="Open Liberty" \ - org.opencontainers.image.url="https://openliberty.io/" \ - org.opencontainers.image.source="https://github.com/OpenLiberty/ci.docker" \ - org.opencontainers.image.revision="$LIBERTY_BUILD_LABEL" \ - org.opencontainers.image.description="This image contains the Open 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://github.com/OpenLiberty/ci.docker#building-an-application-image" \ - org.opencontainers.image.title="Open Liberty" \ - org.opencontainers.image.version="$LIBERTY_VERSION" - COPY NOTICES /opt/ol/NOTICES COPY helpers /opt/ol/helpers COPY fixes/ /opt/ol/fixes/ @@ -52,6 +43,15 @@ 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, Melissa Lee, Thomas Watson, Michal Broz, Wendy Raschke" \ + org.opencontainers.image.vendor="Open Liberty" \ + org.opencontainers.image.url="https://openliberty.io/" \ + org.opencontainers.image.source="https://github.com/OpenLiberty/ci.docker" \ + org.opencontainers.image.revision="$LIBERTY_BUILD_LABEL" \ + org.opencontainers.image.description="This image contains the Open 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://github.com/OpenLiberty/ci.docker#building-an-application-image" \ + org.opencontainers.image.title="Open Liberty" \ + org.opencontainers.image.version="$LIBERTY_VERSION" + # Install Open Liberty RUN apt-get update \ && apt-get install -y --no-install-recommends unzip openssl wget \ diff --git a/releases/23.0.0.12/kernel-slim/Dockerfile.ubi.ibmjava8 b/releases/23.0.0.12/kernel-slim/Dockerfile.ubi.ibmjava8 index 9e33c7261..7e9c39199 100644 --- a/releases/23.0.0.12/kernel-slim/Dockerfile.ubi.ibmjava8 +++ b/releases/23.0.0.12/kernel-slim/Dockerfile.ubi.ibmjava8 @@ -34,18 +34,6 @@ ARG LIBERTY_BUILD_LABEL=replace_with_gm_driver_label ARG OPENJ9_SCC=true ARG VERBOSE=false -LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Melissa Lee, Thomas Watson, Michal Broz, Wendy Raschke" \ - org.opencontainers.image.vendor="Open Liberty" \ - org.opencontainers.image.url="https://openliberty.io/" \ - org.opencontainers.image.source="https://github.com/OpenLiberty/ci.docker" \ - org.opencontainers.image.version="$LIBERTY_VERSION" \ - org.opencontainers.image.revision="$LIBERTY_BUILD_LABEL" \ - vendor="Open Liberty" \ - name="Open Liberty" \ - version="$LIBERTY_VERSION" \ - summary="Image for Open Liberty with IBM's Java and UBI 8" \ - description="This image contains the Open Liberty runtime with IBM's Java and Red Hat UBI 8 as the base OS. For more information on this image please see https://github.com/OpenLiberty/ci.docker#building-an-application-image" - COPY NOTICES /opt/ol/NOTICES COPY helpers /opt/ol/helpers COPY fixes/ /opt/ol/fixes/ @@ -79,6 +67,18 @@ 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, Melissa Lee, Thomas Watson, Michal Broz, Wendy Raschke" \ + org.opencontainers.image.vendor="Open Liberty" \ + org.opencontainers.image.url="https://openliberty.io/" \ + org.opencontainers.image.source="https://github.com/OpenLiberty/ci.docker" \ + org.opencontainers.image.version="$LIBERTY_VERSION" \ + org.opencontainers.image.revision="$LIBERTY_BUILD_LABEL" \ + vendor="Open Liberty" \ + name="Open Liberty" \ + version="$LIBERTY_VERSION" \ + summary="Image for Open Liberty with IBM's Java and UBI 8" \ + description="This image contains the Open Liberty runtime with IBM's Java and Red Hat UBI 8 as the base OS. For more information on this image please see https://github.com/OpenLiberty/ci.docker#building-an-application-image" + # 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/ol/wlp \ diff --git a/releases/23.0.0.12/kernel-slim/Dockerfile.ubi.openjdk11 b/releases/23.0.0.12/kernel-slim/Dockerfile.ubi.openjdk11 index 3f5918551..42724be6e 100644 --- a/releases/23.0.0.12/kernel-slim/Dockerfile.ubi.openjdk11 +++ b/releases/23.0.0.12/kernel-slim/Dockerfile.ubi.openjdk11 @@ -34,18 +34,6 @@ ARG LIBERTY_BUILD_LABEL=replace_with_gm_driver_label ARG OPENJ9_SCC=true ARG VERBOSE=false -LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Melissa Lee, Thomas Watson, Michal Broz, Wendy Raschke" \ - org.opencontainers.image.vendor="Open Liberty" \ - org.opencontainers.image.url="https://openliberty.io/" \ - org.opencontainers.image.source="https://github.com/OpenLiberty/ci.docker" \ - org.opencontainers.image.version="$LIBERTY_VERSION" \ - org.opencontainers.image.revision="$LIBERTY_BUILD_LABEL" \ - vendor="Open Liberty" \ - name="Open Liberty" \ - version="$LIBERTY_VERSION" \ - summary="Image for Open Liberty with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and UBI 8" \ - description="This image contains the Open Liberty runtime with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and Red Hat UBI 8 as the base OS. For more information on this image please see https://github.com/OpenLiberty/ci.docker#building-an-application-image" - COPY NOTICES /opt/ol/NOTICES COPY helpers /opt/ol/helpers COPY fixes/ /opt/ol/fixes/ @@ -79,6 +67,18 @@ 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, Melissa Lee, Thomas Watson, Michal Broz, Wendy Raschke" \ + org.opencontainers.image.vendor="Open Liberty" \ + org.opencontainers.image.url="https://openliberty.io/" \ + org.opencontainers.image.source="https://github.com/OpenLiberty/ci.docker" \ + org.opencontainers.image.version="$LIBERTY_VERSION" \ + org.opencontainers.image.revision="$LIBERTY_BUILD_LABEL" \ + vendor="Open Liberty" \ + name="Open Liberty" \ + version="$LIBERTY_VERSION" \ + summary="Image for Open Liberty with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and UBI 8" \ + description="This image contains the Open Liberty runtime with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and Red Hat UBI 8 as the base OS. For more information on this image please see https://github.com/OpenLiberty/ci.docker#building-an-application-image" + # 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/ol/wlp \ diff --git a/releases/23.0.0.12/kernel-slim/Dockerfile.ubi.openjdk17 b/releases/23.0.0.12/kernel-slim/Dockerfile.ubi.openjdk17 index a07b50e9c..7f525fb50 100644 --- a/releases/23.0.0.12/kernel-slim/Dockerfile.ubi.openjdk17 +++ b/releases/23.0.0.12/kernel-slim/Dockerfile.ubi.openjdk17 @@ -34,18 +34,6 @@ ARG LIBERTY_BUILD_LABEL=replace_with_gm_driver_label ARG OPENJ9_SCC=true ARG VERBOSE=false -LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Melissa Lee, Thomas Watson, Michal Broz, Wendy Raschke" \ - org.opencontainers.image.vendor="Open Liberty" \ - org.opencontainers.image.url="https://openliberty.io/" \ - org.opencontainers.image.source="https://github.com/OpenLiberty/ci.docker" \ - org.opencontainers.image.version="$LIBERTY_VERSION" \ - org.opencontainers.image.revision="$LIBERTY_BUILD_LABEL" \ - vendor="Open Liberty" \ - name="Open Liberty" \ - version="$LIBERTY_VERSION" \ - summary="Image for Open Liberty with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and UBI 8" \ - description="This image contains the Open Liberty runtime with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and Red Hat UBI 8 as the base OS. For more information on this image please see https://github.com/OpenLiberty/ci.docker#building-an-application-image" - COPY NOTICES /opt/ol/NOTICES COPY helpers /opt/ol/helpers COPY fixes/ /opt/ol/fixes/ @@ -79,6 +67,18 @@ 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, Melissa Lee, Thomas Watson, Michal Broz, Wendy Raschke" \ + org.opencontainers.image.vendor="Open Liberty" \ + org.opencontainers.image.url="https://openliberty.io/" \ + org.opencontainers.image.source="https://github.com/OpenLiberty/ci.docker" \ + org.opencontainers.image.version="$LIBERTY_VERSION" \ + org.opencontainers.image.revision="$LIBERTY_BUILD_LABEL" \ + vendor="Open Liberty" \ + name="Open Liberty" \ + version="$LIBERTY_VERSION" \ + summary="Image for Open Liberty with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and UBI 8" \ + description="This image contains the Open Liberty runtime with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and Red Hat UBI 8 as the base OS. For more information on this image please see https://github.com/OpenLiberty/ci.docker#building-an-application-image" + # 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/ol/wlp \ diff --git a/releases/23.0.0.12/kernel-slim/Dockerfile.ubi.openjdk8 b/releases/23.0.0.12/kernel-slim/Dockerfile.ubi.openjdk8 index 22917861f..bfc43d0e0 100644 --- a/releases/23.0.0.12/kernel-slim/Dockerfile.ubi.openjdk8 +++ b/releases/23.0.0.12/kernel-slim/Dockerfile.ubi.openjdk8 @@ -34,18 +34,6 @@ ARG LIBERTY_BUILD_LABEL=replace_with_gm_driver_label ARG OPENJ9_SCC=true ARG VERBOSE=false -LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Melissa Lee, Thomas Watson, Michal Broz, Wendy Raschke" \ - org.opencontainers.image.vendor="Open Liberty" \ - org.opencontainers.image.url="https://openliberty.io/" \ - org.opencontainers.image.source="https://github.com/OpenLiberty/ci.docker" \ - org.opencontainers.image.version="$LIBERTY_VERSION" \ - org.opencontainers.image.revision="$LIBERTY_BUILD_LABEL" \ - vendor="Open Liberty" \ - name="Open Liberty" \ - version="$LIBERTY_VERSION" \ - summary="Image for Open Liberty with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and UBI 8" \ - description="This image contains the Open Liberty runtime with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and Red Hat UBI 8 as the base OS. For more information on this image please see https://github.com/OpenLiberty/ci.docker#building-an-application-image" - COPY NOTICES /opt/ol/NOTICES COPY helpers /opt/ol/helpers COPY fixes/ /opt/ol/fixes/ @@ -79,6 +67,18 @@ 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, Melissa Lee, Thomas Watson, Michal Broz, Wendy Raschke" \ + org.opencontainers.image.vendor="Open Liberty" \ + org.opencontainers.image.url="https://openliberty.io/" \ + org.opencontainers.image.source="https://github.com/OpenLiberty/ci.docker" \ + org.opencontainers.image.version="$LIBERTY_VERSION" \ + org.opencontainers.image.revision="$LIBERTY_BUILD_LABEL" \ + vendor="Open Liberty" \ + name="Open Liberty" \ + version="$LIBERTY_VERSION" \ + summary="Image for Open Liberty with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and UBI 8" \ + description="This image contains the Open Liberty runtime with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and Red Hat UBI 8 as the base OS. For more information on this image please see https://github.com/OpenLiberty/ci.docker#building-an-application-image" + # 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/ol/wlp \ diff --git a/releases/23.0.0.12/kernel-slim/Dockerfile.ubuntu.openjdk11 b/releases/23.0.0.12/kernel-slim/Dockerfile.ubuntu.openjdk11 index 54041c340..1fac2f148 100644 --- a/releases/23.0.0.12/kernel-slim/Dockerfile.ubuntu.openjdk11 +++ b/releases/23.0.0.12/kernel-slim/Dockerfile.ubuntu.openjdk11 @@ -10,15 +10,6 @@ ARG LIBERTY_BUILD_LABEL=replace_with_gm_driver_label ARG OPENJ9_SCC=true ARG VERBOSE=false -LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Melissa Lee, Thomas Watson, Michal Broz, Wendy Raschke" \ - org.opencontainers.image.vendor="Open Liberty" \ - org.opencontainers.image.url="https://openliberty.io/" \ - org.opencontainers.image.source="https://github.com/OpenLiberty/ci.docker" \ - org.opencontainers.image.revision="$LIBERTY_BUILD_LABEL" \ - org.opencontainers.image.description="This image contains the Open 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://github.com/OpenLiberty/ci.docker#building-an-application-image" \ - org.opencontainers.image.title="Open Liberty" \ - org.opencontainers.image.version="$LIBERTY_VERSION" - COPY NOTICES /opt/ol/NOTICES COPY helpers /opt/ol/helpers COPY fixes/ /opt/ol/fixes/ @@ -52,6 +43,15 @@ 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, Melissa Lee, Thomas Watson, Michal Broz, Wendy Raschke" \ + org.opencontainers.image.vendor="Open Liberty" \ + org.opencontainers.image.url="https://openliberty.io/" \ + org.opencontainers.image.source="https://github.com/OpenLiberty/ci.docker" \ + org.opencontainers.image.revision="$LIBERTY_BUILD_LABEL" \ + org.opencontainers.image.description="This image contains the Open 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://github.com/OpenLiberty/ci.docker#building-an-application-image" \ + org.opencontainers.image.title="Open Liberty" \ + org.opencontainers.image.version="$LIBERTY_VERSION" + # Install Open Liberty RUN apt-get update \ && apt-get install -y --no-install-recommends unzip openssl wget \ diff --git a/releases/23.0.0.12/kernel-slim/Dockerfile.ubuntu.openjdk17 b/releases/23.0.0.12/kernel-slim/Dockerfile.ubuntu.openjdk17 index f7c3143a4..99bc4c8fa 100644 --- a/releases/23.0.0.12/kernel-slim/Dockerfile.ubuntu.openjdk17 +++ b/releases/23.0.0.12/kernel-slim/Dockerfile.ubuntu.openjdk17 @@ -10,15 +10,6 @@ ARG LIBERTY_BUILD_LABEL=replace_with_gm_driver_label ARG OPENJ9_SCC=true ARG VERBOSE=false -LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Melissa Lee, Thomas Watson, Michal Broz, Wendy Raschke" \ - org.opencontainers.image.vendor="Open Liberty" \ - org.opencontainers.image.url="https://openliberty.io/" \ - org.opencontainers.image.source="https://github.com/OpenLiberty/ci.docker" \ - org.opencontainers.image.revision="$LIBERTY_BUILD_LABEL" \ - org.opencontainers.image.description="This image contains the Open 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://github.com/OpenLiberty/ci.docker#building-an-application-image" \ - org.opencontainers.image.title="Open Liberty" \ - org.opencontainers.image.version="$LIBERTY_VERSION" - COPY NOTICES /opt/ol/NOTICES COPY helpers /opt/ol/helpers COPY fixes/ /opt/ol/fixes/ @@ -52,6 +43,15 @@ 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, Melissa Lee, Thomas Watson, Michal Broz, Wendy Raschke" \ + org.opencontainers.image.vendor="Open Liberty" \ + org.opencontainers.image.url="https://openliberty.io/" \ + org.opencontainers.image.source="https://github.com/OpenLiberty/ci.docker" \ + org.opencontainers.image.revision="$LIBERTY_BUILD_LABEL" \ + org.opencontainers.image.description="This image contains the Open 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://github.com/OpenLiberty/ci.docker#building-an-application-image" \ + org.opencontainers.image.title="Open Liberty" \ + org.opencontainers.image.version="$LIBERTY_VERSION" + # Install Open Liberty RUN apt-get update \ && apt-get install -y --no-install-recommends unzip openssl wget \ diff --git a/releases/23.0.0.12/kernel-slim/Dockerfile.ubuntu.openjdk8 b/releases/23.0.0.12/kernel-slim/Dockerfile.ubuntu.openjdk8 index b9047363a..850642b6c 100644 --- a/releases/23.0.0.12/kernel-slim/Dockerfile.ubuntu.openjdk8 +++ b/releases/23.0.0.12/kernel-slim/Dockerfile.ubuntu.openjdk8 @@ -10,15 +10,6 @@ ARG LIBERTY_BUILD_LABEL=replace_with_gm_driver_label ARG OPENJ9_SCC=true ARG VERBOSE=false -LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Melissa Lee, Thomas Watson, Michal Broz, Wendy Raschke" \ - org.opencontainers.image.vendor="Open Liberty" \ - org.opencontainers.image.url="https://openliberty.io/" \ - org.opencontainers.image.source="https://github.com/OpenLiberty/ci.docker" \ - org.opencontainers.image.revision="$LIBERTY_BUILD_LABEL" \ - org.opencontainers.image.description="This image contains the Open 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://github.com/OpenLiberty/ci.docker#building-an-application-image" \ - org.opencontainers.image.title="Open Liberty" \ - org.opencontainers.image.version="$LIBERTY_VERSION" - COPY NOTICES /opt/ol/NOTICES COPY helpers /opt/ol/helpers COPY fixes/ /opt/ol/fixes/ @@ -52,6 +43,15 @@ 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, Melissa Lee, Thomas Watson, Michal Broz, Wendy Raschke" \ + org.opencontainers.image.vendor="Open Liberty" \ + org.opencontainers.image.url="https://openliberty.io/" \ + org.opencontainers.image.source="https://github.com/OpenLiberty/ci.docker" \ + org.opencontainers.image.revision="$LIBERTY_BUILD_LABEL" \ + org.opencontainers.image.description="This image contains the Open 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://github.com/OpenLiberty/ci.docker#building-an-application-image" \ + org.opencontainers.image.title="Open Liberty" \ + org.opencontainers.image.version="$LIBERTY_VERSION" + # Install Open Liberty RUN apt-get update \ && apt-get install -y --no-install-recommends unzip openssl wget \ diff --git a/releases/23.0.0.9/full/Dockerfile.ubi.ibmjava8 b/releases/23.0.0.9/full/Dockerfile.ubi.ibmjava8 index b30bf5567..310a83b5a 100644 --- a/releases/23.0.0.9/full/Dockerfile.ubi.ibmjava8 +++ b/releases/23.0.0.9/full/Dockerfile.ubi.ibmjava8 @@ -34,18 +34,6 @@ ARG LIBERTY_BUILD_LABEL=cl230920230904-1158 ARG OPENJ9_SCC=true ARG VERBOSE=false -LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Melissa Lee, Thomas Watson, Michal Broz, Wendy Raschke" \ - org.opencontainers.image.vendor="Open Liberty" \ - org.opencontainers.image.url="https://openliberty.io/" \ - org.opencontainers.image.source="https://github.com/OpenLiberty/ci.docker" \ - org.opencontainers.image.version="$LIBERTY_VERSION" \ - org.opencontainers.image.revision="$LIBERTY_BUILD_LABEL" \ - vendor="Open Liberty" \ - name="Open Liberty" \ - version="$LIBERTY_VERSION" \ - summary="Image for Open Liberty with IBM's Java and UBI 8" \ - description="This image contains the Open Liberty runtime with IBM's Java and Red Hat UBI 8 as the base OS. For more information on this image please see https://github.com/OpenLiberty/ci.docker#building-an-application-image" - COPY NOTICES /opt/ol/NOTICES COPY helpers /opt/ol/helpers COPY fixes/ /opt/ol/fixes/ @@ -79,6 +67,18 @@ 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, Melissa Lee, Thomas Watson, Michal Broz, Wendy Raschke" \ + org.opencontainers.image.vendor="Open Liberty" \ + org.opencontainers.image.url="https://openliberty.io/" \ + org.opencontainers.image.source="https://github.com/OpenLiberty/ci.docker" \ + org.opencontainers.image.version="$LIBERTY_VERSION" \ + org.opencontainers.image.revision="$LIBERTY_BUILD_LABEL" \ + vendor="Open Liberty" \ + name="Open Liberty" \ + version="$LIBERTY_VERSION" \ + summary="Image for Open Liberty with IBM's Java and UBI 8" \ + description="This image contains the Open Liberty runtime with IBM's Java and Red Hat UBI 8 as the base OS. For more information on this image please see https://github.com/OpenLiberty/ci.docker#building-an-application-image" + # 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/ol/wlp \ diff --git a/releases/23.0.0.9/full/Dockerfile.ubi.openjdk11 b/releases/23.0.0.9/full/Dockerfile.ubi.openjdk11 index 8ae984baf..71927a96c 100644 --- a/releases/23.0.0.9/full/Dockerfile.ubi.openjdk11 +++ b/releases/23.0.0.9/full/Dockerfile.ubi.openjdk11 @@ -34,18 +34,6 @@ ARG LIBERTY_BUILD_LABEL=cl230920230904-1158 ARG OPENJ9_SCC=true ARG VERBOSE=false -LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Melissa Lee, Thomas Watson, Michal Broz, Wendy Raschke" \ - org.opencontainers.image.vendor="Open Liberty" \ - org.opencontainers.image.url="https://openliberty.io/" \ - org.opencontainers.image.source="https://github.com/OpenLiberty/ci.docker" \ - org.opencontainers.image.version="$LIBERTY_VERSION" \ - org.opencontainers.image.revision="$LIBERTY_BUILD_LABEL" \ - vendor="Open Liberty" \ - name="Open Liberty" \ - version="$LIBERTY_VERSION" \ - summary="Image for Open Liberty with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and UBI 8" \ - description="This image contains the Open Liberty runtime with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and Red Hat UBI 8 as the base OS. For more information on this image please see https://github.com/OpenLiberty/ci.docker#building-an-application-image" - COPY NOTICES /opt/ol/NOTICES COPY helpers /opt/ol/helpers COPY fixes/ /opt/ol/fixes/ @@ -79,6 +67,18 @@ 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, Melissa Lee, Thomas Watson, Michal Broz, Wendy Raschke" \ + org.opencontainers.image.vendor="Open Liberty" \ + org.opencontainers.image.url="https://openliberty.io/" \ + org.opencontainers.image.source="https://github.com/OpenLiberty/ci.docker" \ + org.opencontainers.image.version="$LIBERTY_VERSION" \ + org.opencontainers.image.revision="$LIBERTY_BUILD_LABEL" \ + vendor="Open Liberty" \ + name="Open Liberty" \ + version="$LIBERTY_VERSION" \ + summary="Image for Open Liberty with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and UBI 8" \ + description="This image contains the Open Liberty runtime with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and Red Hat UBI 8 as the base OS. For more information on this image please see https://github.com/OpenLiberty/ci.docker#building-an-application-image" + # 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/ol/wlp \ diff --git a/releases/23.0.0.9/full/Dockerfile.ubi.openjdk17 b/releases/23.0.0.9/full/Dockerfile.ubi.openjdk17 index 7bced029b..a2f672902 100644 --- a/releases/23.0.0.9/full/Dockerfile.ubi.openjdk17 +++ b/releases/23.0.0.9/full/Dockerfile.ubi.openjdk17 @@ -34,18 +34,6 @@ ARG LIBERTY_BUILD_LABEL=cl230920230904-1158 ARG OPENJ9_SCC=true ARG VERBOSE=false -LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Melissa Lee, Thomas Watson, Michal Broz, Wendy Raschke" \ - org.opencontainers.image.vendor="Open Liberty" \ - org.opencontainers.image.url="https://openliberty.io/" \ - org.opencontainers.image.source="https://github.com/OpenLiberty/ci.docker" \ - org.opencontainers.image.version="$LIBERTY_VERSION" \ - org.opencontainers.image.revision="$LIBERTY_BUILD_LABEL" \ - vendor="Open Liberty" \ - name="Open Liberty" \ - version="$LIBERTY_VERSION" \ - summary="Image for Open Liberty with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and UBI 8" \ - description="This image contains the Open Liberty runtime with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and Red Hat UBI 8 as the base OS. For more information on this image please see https://github.com/OpenLiberty/ci.docker#building-an-application-image" - COPY NOTICES /opt/ol/NOTICES COPY helpers /opt/ol/helpers COPY fixes/ /opt/ol/fixes/ @@ -79,6 +67,18 @@ 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, Melissa Lee, Thomas Watson, Michal Broz, Wendy Raschke" \ + org.opencontainers.image.vendor="Open Liberty" \ + org.opencontainers.image.url="https://openliberty.io/" \ + org.opencontainers.image.source="https://github.com/OpenLiberty/ci.docker" \ + org.opencontainers.image.version="$LIBERTY_VERSION" \ + org.opencontainers.image.revision="$LIBERTY_BUILD_LABEL" \ + vendor="Open Liberty" \ + name="Open Liberty" \ + version="$LIBERTY_VERSION" \ + summary="Image for Open Liberty with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and UBI 8" \ + description="This image contains the Open Liberty runtime with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and Red Hat UBI 8 as the base OS. For more information on this image please see https://github.com/OpenLiberty/ci.docker#building-an-application-image" + # 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/ol/wlp \ diff --git a/releases/23.0.0.9/full/Dockerfile.ubi.openjdk8 b/releases/23.0.0.9/full/Dockerfile.ubi.openjdk8 index 052a79710..6d8f73a4a 100644 --- a/releases/23.0.0.9/full/Dockerfile.ubi.openjdk8 +++ b/releases/23.0.0.9/full/Dockerfile.ubi.openjdk8 @@ -34,18 +34,6 @@ ARG LIBERTY_BUILD_LABEL=cl230920230904-1158 ARG OPENJ9_SCC=true ARG VERBOSE=false -LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Melissa Lee, Thomas Watson, Michal Broz, Wendy Raschke" \ - org.opencontainers.image.vendor="Open Liberty" \ - org.opencontainers.image.url="https://openliberty.io/" \ - org.opencontainers.image.source="https://github.com/OpenLiberty/ci.docker" \ - org.opencontainers.image.version="$LIBERTY_VERSION" \ - org.opencontainers.image.revision="$LIBERTY_BUILD_LABEL" \ - vendor="Open Liberty" \ - name="Open Liberty" \ - version="$LIBERTY_VERSION" \ - summary="Image for Open Liberty with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and UBI 8" \ - description="This image contains the Open Liberty runtime with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and Red Hat UBI 8 as the base OS. For more information on this image please see https://github.com/OpenLiberty/ci.docker#building-an-application-image" - COPY NOTICES /opt/ol/NOTICES COPY helpers /opt/ol/helpers COPY fixes/ /opt/ol/fixes/ @@ -79,6 +67,18 @@ 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, Melissa Lee, Thomas Watson, Michal Broz, Wendy Raschke" \ + org.opencontainers.image.vendor="Open Liberty" \ + org.opencontainers.image.url="https://openliberty.io/" \ + org.opencontainers.image.source="https://github.com/OpenLiberty/ci.docker" \ + org.opencontainers.image.version="$LIBERTY_VERSION" \ + org.opencontainers.image.revision="$LIBERTY_BUILD_LABEL" \ + vendor="Open Liberty" \ + name="Open Liberty" \ + version="$LIBERTY_VERSION" \ + summary="Image for Open Liberty with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and UBI 8" \ + description="This image contains the Open Liberty runtime with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and Red Hat UBI 8 as the base OS. For more information on this image please see https://github.com/OpenLiberty/ci.docker#building-an-application-image" + # 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/ol/wlp \ diff --git a/releases/23.0.0.9/full/Dockerfile.ubuntu.openjdk11 b/releases/23.0.0.9/full/Dockerfile.ubuntu.openjdk11 index 14bf263c5..d1f50e720 100644 --- a/releases/23.0.0.9/full/Dockerfile.ubuntu.openjdk11 +++ b/releases/23.0.0.9/full/Dockerfile.ubuntu.openjdk11 @@ -10,15 +10,6 @@ ARG LIBERTY_BUILD_LABEL=cl230920230904-1158 ARG OPENJ9_SCC=true ARG VERBOSE=false -LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Melissa Lee, Thomas Watson, Michal Broz, Wendy Raschke" \ - org.opencontainers.image.vendor="Open Liberty" \ - org.opencontainers.image.url="https://openliberty.io/" \ - org.opencontainers.image.source="https://github.com/OpenLiberty/ci.docker" \ - org.opencontainers.image.revision="$LIBERTY_BUILD_LABEL" \ - org.opencontainers.image.description="This image contains the Open 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://github.com/OpenLiberty/ci.docker#building-an-application-image" \ - org.opencontainers.image.title="Open Liberty" \ - org.opencontainers.image.version="$LIBERTY_VERSION" - COPY NOTICES /opt/ol/NOTICES COPY helpers /opt/ol/helpers COPY fixes/ /opt/ol/fixes/ @@ -52,6 +43,15 @@ 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, Melissa Lee, Thomas Watson, Michal Broz, Wendy Raschke" \ + org.opencontainers.image.vendor="Open Liberty" \ + org.opencontainers.image.url="https://openliberty.io/" \ + org.opencontainers.image.source="https://github.com/OpenLiberty/ci.docker" \ + org.opencontainers.image.revision="$LIBERTY_BUILD_LABEL" \ + org.opencontainers.image.description="This image contains the Open 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://github.com/OpenLiberty/ci.docker#building-an-application-image" \ + org.opencontainers.image.title="Open Liberty" \ + org.opencontainers.image.version="$LIBERTY_VERSION" + # Install Open Liberty RUN apt-get update \ && apt-get install -y --no-install-recommends unzip openssl wget \ diff --git a/releases/23.0.0.9/full/Dockerfile.ubuntu.openjdk17 b/releases/23.0.0.9/full/Dockerfile.ubuntu.openjdk17 index b708e3bfc..a8d950460 100644 --- a/releases/23.0.0.9/full/Dockerfile.ubuntu.openjdk17 +++ b/releases/23.0.0.9/full/Dockerfile.ubuntu.openjdk17 @@ -10,15 +10,6 @@ ARG LIBERTY_BUILD_LABEL=cl230920230904-1158 ARG OPENJ9_SCC=true ARG VERBOSE=false -LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Melissa Lee, Thomas Watson, Michal Broz, Wendy Raschke" \ - org.opencontainers.image.vendor="Open Liberty" \ - org.opencontainers.image.url="https://openliberty.io/" \ - org.opencontainers.image.source="https://github.com/OpenLiberty/ci.docker" \ - org.opencontainers.image.revision="$LIBERTY_BUILD_LABEL" \ - org.opencontainers.image.description="This image contains the Open 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://github.com/OpenLiberty/ci.docker#building-an-application-image" \ - org.opencontainers.image.title="Open Liberty" \ - org.opencontainers.image.version="$LIBERTY_VERSION" - COPY NOTICES /opt/ol/NOTICES COPY helpers /opt/ol/helpers COPY fixes/ /opt/ol/fixes/ @@ -52,6 +43,15 @@ 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, Melissa Lee, Thomas Watson, Michal Broz, Wendy Raschke" \ + org.opencontainers.image.vendor="Open Liberty" \ + org.opencontainers.image.url="https://openliberty.io/" \ + org.opencontainers.image.source="https://github.com/OpenLiberty/ci.docker" \ + org.opencontainers.image.revision="$LIBERTY_BUILD_LABEL" \ + org.opencontainers.image.description="This image contains the Open 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://github.com/OpenLiberty/ci.docker#building-an-application-image" \ + org.opencontainers.image.title="Open Liberty" \ + org.opencontainers.image.version="$LIBERTY_VERSION" + # Install Open Liberty RUN apt-get update \ && apt-get install -y --no-install-recommends unzip openssl wget \ diff --git a/releases/23.0.0.9/full/Dockerfile.ubuntu.openjdk8 b/releases/23.0.0.9/full/Dockerfile.ubuntu.openjdk8 index bdbc636a8..96077f915 100644 --- a/releases/23.0.0.9/full/Dockerfile.ubuntu.openjdk8 +++ b/releases/23.0.0.9/full/Dockerfile.ubuntu.openjdk8 @@ -10,15 +10,6 @@ ARG LIBERTY_BUILD_LABEL=cl230920230904-1158 ARG OPENJ9_SCC=true ARG VERBOSE=false -LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Melissa Lee, Thomas Watson, Michal Broz, Wendy Raschke" \ - org.opencontainers.image.vendor="Open Liberty" \ - org.opencontainers.image.url="https://openliberty.io/" \ - org.opencontainers.image.source="https://github.com/OpenLiberty/ci.docker" \ - org.opencontainers.image.revision="$LIBERTY_BUILD_LABEL" \ - org.opencontainers.image.description="This image contains the Open 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://github.com/OpenLiberty/ci.docker#building-an-application-image" \ - org.opencontainers.image.title="Open Liberty" \ - org.opencontainers.image.version="$LIBERTY_VERSION" - COPY NOTICES /opt/ol/NOTICES COPY helpers /opt/ol/helpers COPY fixes/ /opt/ol/fixes/ @@ -52,6 +43,15 @@ 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, Melissa Lee, Thomas Watson, Michal Broz, Wendy Raschke" \ + org.opencontainers.image.vendor="Open Liberty" \ + org.opencontainers.image.url="https://openliberty.io/" \ + org.opencontainers.image.source="https://github.com/OpenLiberty/ci.docker" \ + org.opencontainers.image.revision="$LIBERTY_BUILD_LABEL" \ + org.opencontainers.image.description="This image contains the Open 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://github.com/OpenLiberty/ci.docker#building-an-application-image" \ + org.opencontainers.image.title="Open Liberty" \ + org.opencontainers.image.version="$LIBERTY_VERSION" + # Install Open Liberty RUN apt-get update \ && apt-get install -y --no-install-recommends unzip openssl wget \ diff --git a/releases/23.0.0.9/kernel-slim/Dockerfile.ubi.ibmjava8 b/releases/23.0.0.9/kernel-slim/Dockerfile.ubi.ibmjava8 index 18c7ac43d..def21a484 100644 --- a/releases/23.0.0.9/kernel-slim/Dockerfile.ubi.ibmjava8 +++ b/releases/23.0.0.9/kernel-slim/Dockerfile.ubi.ibmjava8 @@ -34,18 +34,6 @@ ARG LIBERTY_BUILD_LABEL=cl230920230904-1158 ARG OPENJ9_SCC=true ARG VERBOSE=false -LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Melissa Lee, Thomas Watson, Michal Broz, Wendy Raschke" \ - org.opencontainers.image.vendor="Open Liberty" \ - org.opencontainers.image.url="https://openliberty.io/" \ - org.opencontainers.image.source="https://github.com/OpenLiberty/ci.docker" \ - org.opencontainers.image.version="$LIBERTY_VERSION" \ - org.opencontainers.image.revision="$LIBERTY_BUILD_LABEL" \ - vendor="Open Liberty" \ - name="Open Liberty" \ - version="$LIBERTY_VERSION" \ - summary="Image for Open Liberty with IBM's Java and UBI 8" \ - description="This image contains the Open Liberty runtime with IBM's Java and Red Hat UBI 8 as the base OS. For more information on this image please see https://github.com/OpenLiberty/ci.docker#building-an-application-image" - COPY NOTICES /opt/ol/NOTICES COPY helpers /opt/ol/helpers COPY fixes/ /opt/ol/fixes/ @@ -79,6 +67,18 @@ 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, Melissa Lee, Thomas Watson, Michal Broz, Wendy Raschke" \ + org.opencontainers.image.vendor="Open Liberty" \ + org.opencontainers.image.url="https://openliberty.io/" \ + org.opencontainers.image.source="https://github.com/OpenLiberty/ci.docker" \ + org.opencontainers.image.version="$LIBERTY_VERSION" \ + org.opencontainers.image.revision="$LIBERTY_BUILD_LABEL" \ + vendor="Open Liberty" \ + name="Open Liberty" \ + version="$LIBERTY_VERSION" \ + summary="Image for Open Liberty with IBM's Java and UBI 8" \ + description="This image contains the Open Liberty runtime with IBM's Java and Red Hat UBI 8 as the base OS. For more information on this image please see https://github.com/OpenLiberty/ci.docker#building-an-application-image" + # 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/ol/wlp \ diff --git a/releases/23.0.0.9/kernel-slim/Dockerfile.ubi.openjdk11 b/releases/23.0.0.9/kernel-slim/Dockerfile.ubi.openjdk11 index b5736dbcc..b50fe696c 100644 --- a/releases/23.0.0.9/kernel-slim/Dockerfile.ubi.openjdk11 +++ b/releases/23.0.0.9/kernel-slim/Dockerfile.ubi.openjdk11 @@ -34,18 +34,6 @@ ARG LIBERTY_BUILD_LABEL=cl230920230904-1158 ARG OPENJ9_SCC=true ARG VERBOSE=false -LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Melissa Lee, Thomas Watson, Michal Broz, Wendy Raschke" \ - org.opencontainers.image.vendor="Open Liberty" \ - org.opencontainers.image.url="https://openliberty.io/" \ - org.opencontainers.image.source="https://github.com/OpenLiberty/ci.docker" \ - org.opencontainers.image.version="$LIBERTY_VERSION" \ - org.opencontainers.image.revision="$LIBERTY_BUILD_LABEL" \ - vendor="Open Liberty" \ - name="Open Liberty" \ - version="$LIBERTY_VERSION" \ - summary="Image for Open Liberty with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and UBI 8" \ - description="This image contains the Open Liberty runtime with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and Red Hat UBI 8 as the base OS. For more information on this image please see https://github.com/OpenLiberty/ci.docker#building-an-application-image" - COPY NOTICES /opt/ol/NOTICES COPY helpers /opt/ol/helpers COPY fixes/ /opt/ol/fixes/ @@ -79,6 +67,18 @@ 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, Melissa Lee, Thomas Watson, Michal Broz, Wendy Raschke" \ + org.opencontainers.image.vendor="Open Liberty" \ + org.opencontainers.image.url="https://openliberty.io/" \ + org.opencontainers.image.source="https://github.com/OpenLiberty/ci.docker" \ + org.opencontainers.image.version="$LIBERTY_VERSION" \ + org.opencontainers.image.revision="$LIBERTY_BUILD_LABEL" \ + vendor="Open Liberty" \ + name="Open Liberty" \ + version="$LIBERTY_VERSION" \ + summary="Image for Open Liberty with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and UBI 8" \ + description="This image contains the Open Liberty runtime with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and Red Hat UBI 8 as the base OS. For more information on this image please see https://github.com/OpenLiberty/ci.docker#building-an-application-image" + # 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/ol/wlp \ diff --git a/releases/23.0.0.9/kernel-slim/Dockerfile.ubi.openjdk17 b/releases/23.0.0.9/kernel-slim/Dockerfile.ubi.openjdk17 index 98272e517..0ab12d5b2 100644 --- a/releases/23.0.0.9/kernel-slim/Dockerfile.ubi.openjdk17 +++ b/releases/23.0.0.9/kernel-slim/Dockerfile.ubi.openjdk17 @@ -34,18 +34,6 @@ ARG LIBERTY_BUILD_LABEL=cl230920230904-1158 ARG OPENJ9_SCC=true ARG VERBOSE=false -LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Melissa Lee, Thomas Watson, Michal Broz, Wendy Raschke" \ - org.opencontainers.image.vendor="Open Liberty" \ - org.opencontainers.image.url="https://openliberty.io/" \ - org.opencontainers.image.source="https://github.com/OpenLiberty/ci.docker" \ - org.opencontainers.image.version="$LIBERTY_VERSION" \ - org.opencontainers.image.revision="$LIBERTY_BUILD_LABEL" \ - vendor="Open Liberty" \ - name="Open Liberty" \ - version="$LIBERTY_VERSION" \ - summary="Image for Open Liberty with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and UBI 8" \ - description="This image contains the Open Liberty runtime with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and Red Hat UBI 8 as the base OS. For more information on this image please see https://github.com/OpenLiberty/ci.docker#building-an-application-image" - COPY NOTICES /opt/ol/NOTICES COPY helpers /opt/ol/helpers COPY fixes/ /opt/ol/fixes/ @@ -79,6 +67,18 @@ 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, Melissa Lee, Thomas Watson, Michal Broz, Wendy Raschke" \ + org.opencontainers.image.vendor="Open Liberty" \ + org.opencontainers.image.url="https://openliberty.io/" \ + org.opencontainers.image.source="https://github.com/OpenLiberty/ci.docker" \ + org.opencontainers.image.version="$LIBERTY_VERSION" \ + org.opencontainers.image.revision="$LIBERTY_BUILD_LABEL" \ + vendor="Open Liberty" \ + name="Open Liberty" \ + version="$LIBERTY_VERSION" \ + summary="Image for Open Liberty with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and UBI 8" \ + description="This image contains the Open Liberty runtime with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and Red Hat UBI 8 as the base OS. For more information on this image please see https://github.com/OpenLiberty/ci.docker#building-an-application-image" + # 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/ol/wlp \ diff --git a/releases/23.0.0.9/kernel-slim/Dockerfile.ubi.openjdk8 b/releases/23.0.0.9/kernel-slim/Dockerfile.ubi.openjdk8 index c5684cd4e..64c779216 100644 --- a/releases/23.0.0.9/kernel-slim/Dockerfile.ubi.openjdk8 +++ b/releases/23.0.0.9/kernel-slim/Dockerfile.ubi.openjdk8 @@ -34,18 +34,6 @@ ARG LIBERTY_BUILD_LABEL=cl230920230904-1158 ARG OPENJ9_SCC=true ARG VERBOSE=false -LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Melissa Lee, Thomas Watson, Michal Broz, Wendy Raschke" \ - org.opencontainers.image.vendor="Open Liberty" \ - org.opencontainers.image.url="https://openliberty.io/" \ - org.opencontainers.image.source="https://github.com/OpenLiberty/ci.docker" \ - org.opencontainers.image.version="$LIBERTY_VERSION" \ - org.opencontainers.image.revision="$LIBERTY_BUILD_LABEL" \ - vendor="Open Liberty" \ - name="Open Liberty" \ - version="$LIBERTY_VERSION" \ - summary="Image for Open Liberty with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and UBI 8" \ - description="This image contains the Open Liberty runtime with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and Red Hat UBI 8 as the base OS. For more information on this image please see https://github.com/OpenLiberty/ci.docker#building-an-application-image" - COPY NOTICES /opt/ol/NOTICES COPY helpers /opt/ol/helpers COPY fixes/ /opt/ol/fixes/ @@ -79,6 +67,18 @@ 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, Melissa Lee, Thomas Watson, Michal Broz, Wendy Raschke" \ + org.opencontainers.image.vendor="Open Liberty" \ + org.opencontainers.image.url="https://openliberty.io/" \ + org.opencontainers.image.source="https://github.com/OpenLiberty/ci.docker" \ + org.opencontainers.image.version="$LIBERTY_VERSION" \ + org.opencontainers.image.revision="$LIBERTY_BUILD_LABEL" \ + vendor="Open Liberty" \ + name="Open Liberty" \ + version="$LIBERTY_VERSION" \ + summary="Image for Open Liberty with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and UBI 8" \ + description="This image contains the Open Liberty runtime with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and Red Hat UBI 8 as the base OS. For more information on this image please see https://github.com/OpenLiberty/ci.docker#building-an-application-image" + # 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/ol/wlp \ diff --git a/releases/23.0.0.9/kernel-slim/Dockerfile.ubuntu.openjdk11 b/releases/23.0.0.9/kernel-slim/Dockerfile.ubuntu.openjdk11 index f66810a12..151b33d93 100644 --- a/releases/23.0.0.9/kernel-slim/Dockerfile.ubuntu.openjdk11 +++ b/releases/23.0.0.9/kernel-slim/Dockerfile.ubuntu.openjdk11 @@ -10,15 +10,6 @@ ARG LIBERTY_BUILD_LABEL=cl230920230904-1158 ARG OPENJ9_SCC=true ARG VERBOSE=false -LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Melissa Lee, Thomas Watson, Michal Broz, Wendy Raschke" \ - org.opencontainers.image.vendor="Open Liberty" \ - org.opencontainers.image.url="https://openliberty.io/" \ - org.opencontainers.image.source="https://github.com/OpenLiberty/ci.docker" \ - org.opencontainers.image.revision="$LIBERTY_BUILD_LABEL" \ - org.opencontainers.image.description="This image contains the Open 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://github.com/OpenLiberty/ci.docker#building-an-application-image" \ - org.opencontainers.image.title="Open Liberty" \ - org.opencontainers.image.version="$LIBERTY_VERSION" - COPY NOTICES /opt/ol/NOTICES COPY helpers /opt/ol/helpers COPY fixes/ /opt/ol/fixes/ @@ -52,6 +43,15 @@ 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, Melissa Lee, Thomas Watson, Michal Broz, Wendy Raschke" \ + org.opencontainers.image.vendor="Open Liberty" \ + org.opencontainers.image.url="https://openliberty.io/" \ + org.opencontainers.image.source="https://github.com/OpenLiberty/ci.docker" \ + org.opencontainers.image.revision="$LIBERTY_BUILD_LABEL" \ + org.opencontainers.image.description="This image contains the Open 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://github.com/OpenLiberty/ci.docker#building-an-application-image" \ + org.opencontainers.image.title="Open Liberty" \ + org.opencontainers.image.version="$LIBERTY_VERSION" + # Install Open Liberty RUN apt-get update \ && apt-get install -y --no-install-recommends unzip openssl wget \ diff --git a/releases/23.0.0.9/kernel-slim/Dockerfile.ubuntu.openjdk17 b/releases/23.0.0.9/kernel-slim/Dockerfile.ubuntu.openjdk17 index a74562bd2..f521e495c 100644 --- a/releases/23.0.0.9/kernel-slim/Dockerfile.ubuntu.openjdk17 +++ b/releases/23.0.0.9/kernel-slim/Dockerfile.ubuntu.openjdk17 @@ -10,15 +10,6 @@ ARG LIBERTY_BUILD_LABEL=cl230920230904-1158 ARG OPENJ9_SCC=true ARG VERBOSE=false -LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Melissa Lee, Thomas Watson, Michal Broz, Wendy Raschke" \ - org.opencontainers.image.vendor="Open Liberty" \ - org.opencontainers.image.url="https://openliberty.io/" \ - org.opencontainers.image.source="https://github.com/OpenLiberty/ci.docker" \ - org.opencontainers.image.revision="$LIBERTY_BUILD_LABEL" \ - org.opencontainers.image.description="This image contains the Open 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://github.com/OpenLiberty/ci.docker#building-an-application-image" \ - org.opencontainers.image.title="Open Liberty" \ - org.opencontainers.image.version="$LIBERTY_VERSION" - COPY NOTICES /opt/ol/NOTICES COPY helpers /opt/ol/helpers COPY fixes/ /opt/ol/fixes/ @@ -52,6 +43,15 @@ 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, Melissa Lee, Thomas Watson, Michal Broz, Wendy Raschke" \ + org.opencontainers.image.vendor="Open Liberty" \ + org.opencontainers.image.url="https://openliberty.io/" \ + org.opencontainers.image.source="https://github.com/OpenLiberty/ci.docker" \ + org.opencontainers.image.revision="$LIBERTY_BUILD_LABEL" \ + org.opencontainers.image.description="This image contains the Open 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://github.com/OpenLiberty/ci.docker#building-an-application-image" \ + org.opencontainers.image.title="Open Liberty" \ + org.opencontainers.image.version="$LIBERTY_VERSION" + # Install Open Liberty RUN apt-get update \ && apt-get install -y --no-install-recommends unzip openssl wget \ diff --git a/releases/23.0.0.9/kernel-slim/Dockerfile.ubuntu.openjdk8 b/releases/23.0.0.9/kernel-slim/Dockerfile.ubuntu.openjdk8 index 6b864457d..65fbc9869 100644 --- a/releases/23.0.0.9/kernel-slim/Dockerfile.ubuntu.openjdk8 +++ b/releases/23.0.0.9/kernel-slim/Dockerfile.ubuntu.openjdk8 @@ -10,15 +10,6 @@ ARG LIBERTY_BUILD_LABEL=cl230920230904-1158 ARG OPENJ9_SCC=true ARG VERBOSE=false -LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Melissa Lee, Thomas Watson, Michal Broz, Wendy Raschke" \ - org.opencontainers.image.vendor="Open Liberty" \ - org.opencontainers.image.url="https://openliberty.io/" \ - org.opencontainers.image.source="https://github.com/OpenLiberty/ci.docker" \ - org.opencontainers.image.revision="$LIBERTY_BUILD_LABEL" \ - org.opencontainers.image.description="This image contains the Open 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://github.com/OpenLiberty/ci.docker#building-an-application-image" \ - org.opencontainers.image.title="Open Liberty" \ - org.opencontainers.image.version="$LIBERTY_VERSION" - COPY NOTICES /opt/ol/NOTICES COPY helpers /opt/ol/helpers COPY fixes/ /opt/ol/fixes/ @@ -52,6 +43,15 @@ 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, Melissa Lee, Thomas Watson, Michal Broz, Wendy Raschke" \ + org.opencontainers.image.vendor="Open Liberty" \ + org.opencontainers.image.url="https://openliberty.io/" \ + org.opencontainers.image.source="https://github.com/OpenLiberty/ci.docker" \ + org.opencontainers.image.revision="$LIBERTY_BUILD_LABEL" \ + org.opencontainers.image.description="This image contains the Open 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://github.com/OpenLiberty/ci.docker#building-an-application-image" \ + org.opencontainers.image.title="Open Liberty" \ + org.opencontainers.image.version="$LIBERTY_VERSION" + # Install Open Liberty RUN apt-get update \ && apt-get install -y --no-install-recommends unzip openssl wget \ diff --git a/releases/latest/beta/Dockerfile.ubi.openjdk17 b/releases/latest/beta/Dockerfile.ubi.openjdk17 index b1aa7c9a2..65be4605d 100644 --- a/releases/latest/beta/Dockerfile.ubi.openjdk17 +++ b/releases/latest/beta/Dockerfile.ubi.openjdk17 @@ -34,18 +34,6 @@ ARG LIBERTY_BUILD_LABEL=replace_with_gm_driver_label ARG OPENJ9_SCC=true ARG VERBOSE=false -LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Melissa Lee, Thomas Watson, Michal Broz, Wendy Raschke" \ - org.opencontainers.image.vendor="Open Liberty" \ - org.opencontainers.image.url="https://openliberty.io/" \ - org.opencontainers.image.source="https://github.com/OpenLiberty/ci.docker" \ - org.opencontainers.image.version="$LIBERTY_VERSION" \ - org.opencontainers.image.revision="$LIBERTY_BUILD_LABEL" \ - vendor="Open Liberty" \ - name="Open Liberty Beta" \ - version="$LIBERTY_VERSION" \ - summary="Image for Open Liberty Beta with IBM Semeru Runtime Open Edition OpenJDK 17 with OpenJ9 and UBI 8" \ - description="This image contains the Open Liberty beta runtime with IBM Semeru Runtime Open Edition OpenJDK 17 with OpenJ9 and Red Hat UBI 8 as the base OS. For more information on this image please see https://github.com/OpenLiberty/ci.docker#building-an-application-image" - COPY NOTICES /opt/ol/NOTICES COPY helpers /opt/ol/helpers COPY fixes/ /opt/ol/fixes/ @@ -79,6 +67,18 @@ 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, Melissa Lee, Thomas Watson, Michal Broz, Wendy Raschke" \ + org.opencontainers.image.vendor="Open Liberty" \ + org.opencontainers.image.url="https://openliberty.io/" \ + org.opencontainers.image.source="https://github.com/OpenLiberty/ci.docker" \ + org.opencontainers.image.version="$LIBERTY_VERSION" \ + org.opencontainers.image.revision="$LIBERTY_BUILD_LABEL" \ + vendor="Open Liberty" \ + name="Open Liberty Beta" \ + version="$LIBERTY_VERSION" \ + summary="Image for Open Liberty Beta with IBM Semeru Runtime Open Edition OpenJDK 17 with OpenJ9 and UBI 8" \ + description="This image contains the Open Liberty beta runtime with IBM Semeru Runtime Open Edition OpenJDK 17 with OpenJ9 and Red Hat UBI 8 as the base OS. For more information on this image please see https://github.com/OpenLiberty/ci.docker#building-an-application-image" + # 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/ol/wlp \ diff --git a/releases/latest/beta/Dockerfile.ubuntu.openjdk11 b/releases/latest/beta/Dockerfile.ubuntu.openjdk11 index d341cdd95..06a2cc517 100644 --- a/releases/latest/beta/Dockerfile.ubuntu.openjdk11 +++ b/releases/latest/beta/Dockerfile.ubuntu.openjdk11 @@ -10,15 +10,6 @@ ARG LIBERTY_BUILD_LABEL=replace_with_gm_driver_label ARG OPENJ9_SCC=true ARG VERBOSE=false -LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Melissa Lee, Thomas Watson, Michal Broz, Wendy Raschke" \ - org.opencontainers.image.vendor="Open Liberty" \ - org.opencontainers.image.url="https://openliberty.io/" \ - org.opencontainers.image.source="https://github.com/OpenLiberty/ci.docker" \ - org.opencontainers.image.revision="$LIBERTY_BUILD_LABEL" \ - org.opencontainers.image.description="This image contains the Open Liberty beta runtime with IBM Semeru Runtime Open Edition OpenJDK 17 with OpenJ9 and Ubuntu as the base OS. For more information on this image please see https://github.com/OpenLiberty/ci.docker#building-an-application-image" \ - org.opencontainers.image.title="Open Liberty Beta" \ - org.opencontainers.image.version="$LIBERTY_VERSION" - COPY NOTICES /opt/ol/NOTICES COPY helpers /opt/ol/helpers COPY fixes/ /opt/ol/fixes/ @@ -52,6 +43,15 @@ 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, Melissa Lee, Thomas Watson, Michal Broz, Wendy Raschke" \ + org.opencontainers.image.vendor="Open Liberty" \ + org.opencontainers.image.url="https://openliberty.io/" \ + org.opencontainers.image.source="https://github.com/OpenLiberty/ci.docker" \ + org.opencontainers.image.revision="$LIBERTY_BUILD_LABEL" \ + org.opencontainers.image.description="This image contains the Open Liberty beta runtime with IBM Semeru Runtime Open Edition OpenJDK 17 with OpenJ9 and Ubuntu as the base OS. For more information on this image please see https://github.com/OpenLiberty/ci.docker#building-an-application-image" \ + org.opencontainers.image.title="Open Liberty Beta" \ + org.opencontainers.image.version="$LIBERTY_VERSION" + # Install Open Liberty RUN apt-get update \ && apt-get install -y --no-install-recommends unzip openssl wget \ diff --git a/releases/latest/beta/Dockerfile.ubuntu.openjdk17 b/releases/latest/beta/Dockerfile.ubuntu.openjdk17 index cb72c034c..bef7ac404 100644 --- a/releases/latest/beta/Dockerfile.ubuntu.openjdk17 +++ b/releases/latest/beta/Dockerfile.ubuntu.openjdk17 @@ -10,15 +10,6 @@ ARG LIBERTY_BUILD_LABEL=replace_with_gm_driver_label ARG OPENJ9_SCC=true ARG VERBOSE=false -LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Melissa Lee, Thomas Watson, Michal Broz, Wendy Raschke" \ - org.opencontainers.image.vendor="Open Liberty" \ - org.opencontainers.image.url="https://openliberty.io/" \ - org.opencontainers.image.source="https://github.com/OpenLiberty/ci.docker" \ - org.opencontainers.image.revision="$LIBERTY_BUILD_LABEL" \ - org.opencontainers.image.description="This image contains the Open Liberty beta runtime with IBM Semeru Runtime Open Edition OpenJDK 17 with OpenJ9 and Ubuntu as the base OS. For more information on this image please see https://github.com/OpenLiberty/ci.docker#building-an-application-image" \ - org.opencontainers.image.title="Open Liberty Beta" \ - org.opencontainers.image.version="$LIBERTY_VERSION" - COPY NOTICES /opt/ol/NOTICES COPY helpers /opt/ol/helpers COPY fixes/ /opt/ol/fixes/ @@ -52,6 +43,15 @@ 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, Melissa Lee, Thomas Watson, Michal Broz, Wendy Raschke" \ + org.opencontainers.image.vendor="Open Liberty" \ + org.opencontainers.image.url="https://openliberty.io/" \ + org.opencontainers.image.source="https://github.com/OpenLiberty/ci.docker" \ + org.opencontainers.image.revision="$LIBERTY_BUILD_LABEL" \ + org.opencontainers.image.description="This image contains the Open Liberty beta runtime with IBM Semeru Runtime Open Edition OpenJDK 17 with OpenJ9 and Ubuntu as the base OS. For more information on this image please see https://github.com/OpenLiberty/ci.docker#building-an-application-image" \ + org.opencontainers.image.title="Open Liberty Beta" \ + org.opencontainers.image.version="$LIBERTY_VERSION" + # Install Open Liberty RUN apt-get update \ && apt-get install -y --no-install-recommends unzip openssl wget \ diff --git a/releases/latest/beta/Dockerfile.ubuntu.openjdk8 b/releases/latest/beta/Dockerfile.ubuntu.openjdk8 index b038b314a..78ef30e3c 100644 --- a/releases/latest/beta/Dockerfile.ubuntu.openjdk8 +++ b/releases/latest/beta/Dockerfile.ubuntu.openjdk8 @@ -10,15 +10,6 @@ ARG LIBERTY_BUILD_LABEL=replace_with_gm_driver_label ARG OPENJ9_SCC=true ARG VERBOSE=false -LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Melissa Lee, Thomas Watson, Michal Broz, Wendy Raschke" \ - org.opencontainers.image.vendor="Open Liberty" \ - org.opencontainers.image.url="https://openliberty.io/" \ - org.opencontainers.image.source="https://github.com/OpenLiberty/ci.docker" \ - org.opencontainers.image.revision="$LIBERTY_BUILD_LABEL" \ - org.opencontainers.image.description="This image contains the Open Liberty beta runtime with IBM Semeru Runtime Open Edition OpenJDK 8 with OpenJ9 and Ubuntu as the base OS. For more information on this image please see https://github.com/OpenLiberty/ci.docker#building-an-application-image" \ - org.opencontainers.image.title="Open Liberty Beta" \ - org.opencontainers.image.version="$LIBERTY_VERSION" - COPY NOTICES /opt/ol/NOTICES COPY helpers /opt/ol/helpers COPY fixes/ /opt/ol/fixes/ @@ -52,6 +43,15 @@ 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, Melissa Lee, Thomas Watson, Michal Broz, Wendy Raschke" \ + org.opencontainers.image.vendor="Open Liberty" \ + org.opencontainers.image.url="https://openliberty.io/" \ + org.opencontainers.image.source="https://github.com/OpenLiberty/ci.docker" \ + org.opencontainers.image.revision="$LIBERTY_BUILD_LABEL" \ + org.opencontainers.image.description="This image contains the Open Liberty beta runtime with IBM Semeru Runtime Open Edition OpenJDK 8 with OpenJ9 and Ubuntu as the base OS. For more information on this image please see https://github.com/OpenLiberty/ci.docker#building-an-application-image" \ + org.opencontainers.image.title="Open Liberty Beta" \ + org.opencontainers.image.version="$LIBERTY_VERSION" + # Install Open Liberty RUN apt-get update \ && apt-get install -y --no-install-recommends unzip openssl wget \ diff --git a/releases/latest/full/Dockerfile.ubi.ibmjava8 b/releases/latest/full/Dockerfile.ubi.ibmjava8 index 48c29a05f..af2a1727a 100644 --- a/releases/latest/full/Dockerfile.ubi.ibmjava8 +++ b/releases/latest/full/Dockerfile.ubi.ibmjava8 @@ -34,18 +34,6 @@ ARG LIBERTY_BUILD_LABEL=replace_with_gm_driver_label ARG OPENJ9_SCC=true ARG VERBOSE=false -LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Melissa Lee, Thomas Watson, Michal Broz, Wendy Raschke" \ - org.opencontainers.image.vendor="Open Liberty" \ - org.opencontainers.image.url="https://openliberty.io/" \ - org.opencontainers.image.source="https://github.com/OpenLiberty/ci.docker" \ - org.opencontainers.image.version="$LIBERTY_VERSION" \ - org.opencontainers.image.revision="$LIBERTY_BUILD_LABEL" \ - vendor="Open Liberty" \ - name="Open Liberty" \ - version="$LIBERTY_VERSION" \ - summary="Image for Open Liberty with IBM's Java and UBI 8" \ - description="This image contains the Open Liberty runtime with IBM's Java and Red Hat UBI 8 as the base OS. For more information on this image please see https://github.com/OpenLiberty/ci.docker#building-an-application-image" - COPY NOTICES /opt/ol/NOTICES COPY helpers /opt/ol/helpers COPY fixes/ /opt/ol/fixes/ @@ -79,6 +67,18 @@ 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, Melissa Lee, Thomas Watson, Michal Broz, Wendy Raschke" \ + org.opencontainers.image.vendor="Open Liberty" \ + org.opencontainers.image.url="https://openliberty.io/" \ + org.opencontainers.image.source="https://github.com/OpenLiberty/ci.docker" \ + org.opencontainers.image.version="$LIBERTY_VERSION" \ + org.opencontainers.image.revision="$LIBERTY_BUILD_LABEL" \ + vendor="Open Liberty" \ + name="Open Liberty" \ + version="$LIBERTY_VERSION" \ + summary="Image for Open Liberty with IBM's Java and UBI 8" \ + description="This image contains the Open Liberty runtime with IBM's Java and Red Hat UBI 8 as the base OS. For more information on this image please see https://github.com/OpenLiberty/ci.docker#building-an-application-image" + # 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/ol/wlp \ diff --git a/releases/latest/full/Dockerfile.ubi.openjdk11 b/releases/latest/full/Dockerfile.ubi.openjdk11 index 39d7cfb22..782f5268e 100644 --- a/releases/latest/full/Dockerfile.ubi.openjdk11 +++ b/releases/latest/full/Dockerfile.ubi.openjdk11 @@ -34,18 +34,6 @@ ARG LIBERTY_BUILD_LABEL=replace_with_gm_driver_label ARG OPENJ9_SCC=true ARG VERBOSE=false -LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Melissa Lee, Thomas Watson, Michal Broz, Wendy Raschke" \ - org.opencontainers.image.vendor="Open Liberty" \ - org.opencontainers.image.url="https://openliberty.io/" \ - org.opencontainers.image.source="https://github.com/OpenLiberty/ci.docker" \ - org.opencontainers.image.version="$LIBERTY_VERSION" \ - org.opencontainers.image.revision="$LIBERTY_BUILD_LABEL" \ - vendor="Open Liberty" \ - name="Open Liberty" \ - version="$LIBERTY_VERSION" \ - summary="Image for Open Liberty with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and UBI 8" \ - description="This image contains the Open Liberty runtime with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and Red Hat UBI 8 as the base OS. For more information on this image please see https://github.com/OpenLiberty/ci.docker#building-an-application-image" - COPY NOTICES /opt/ol/NOTICES COPY helpers /opt/ol/helpers COPY fixes/ /opt/ol/fixes/ @@ -79,6 +67,18 @@ 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, Melissa Lee, Thomas Watson, Michal Broz, Wendy Raschke" \ + org.opencontainers.image.vendor="Open Liberty" \ + org.opencontainers.image.url="https://openliberty.io/" \ + org.opencontainers.image.source="https://github.com/OpenLiberty/ci.docker" \ + org.opencontainers.image.version="$LIBERTY_VERSION" \ + org.opencontainers.image.revision="$LIBERTY_BUILD_LABEL" \ + vendor="Open Liberty" \ + name="Open Liberty" \ + version="$LIBERTY_VERSION" \ + summary="Image for Open Liberty with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and UBI 8" \ + description="This image contains the Open Liberty runtime with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and Red Hat UBI 8 as the base OS. For more information on this image please see https://github.com/OpenLiberty/ci.docker#building-an-application-image" + # 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/ol/wlp \ diff --git a/releases/latest/full/Dockerfile.ubi.openjdk17 b/releases/latest/full/Dockerfile.ubi.openjdk17 index 506ceeab3..e8852e62d 100644 --- a/releases/latest/full/Dockerfile.ubi.openjdk17 +++ b/releases/latest/full/Dockerfile.ubi.openjdk17 @@ -34,18 +34,6 @@ ARG LIBERTY_BUILD_LABEL=replace_with_gm_driver_label ARG OPENJ9_SCC=true ARG VERBOSE=false -LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Melissa Lee, Thomas Watson, Michal Broz, Wendy Raschke" \ - org.opencontainers.image.vendor="Open Liberty" \ - org.opencontainers.image.url="https://openliberty.io/" \ - org.opencontainers.image.source="https://github.com/OpenLiberty/ci.docker" \ - org.opencontainers.image.version="$LIBERTY_VERSION" \ - org.opencontainers.image.revision="$LIBERTY_BUILD_LABEL" \ - vendor="Open Liberty" \ - name="Open Liberty" \ - version="$LIBERTY_VERSION" \ - summary="Image for Open Liberty with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and UBI 8" \ - description="This image contains the Open Liberty runtime with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and Red Hat UBI 8 as the base OS. For more information on this image please see https://github.com/OpenLiberty/ci.docker#building-an-application-image" - COPY NOTICES /opt/ol/NOTICES COPY helpers /opt/ol/helpers COPY fixes/ /opt/ol/fixes/ @@ -79,6 +67,18 @@ 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, Melissa Lee, Thomas Watson, Michal Broz, Wendy Raschke" \ + org.opencontainers.image.vendor="Open Liberty" \ + org.opencontainers.image.url="https://openliberty.io/" \ + org.opencontainers.image.source="https://github.com/OpenLiberty/ci.docker" \ + org.opencontainers.image.version="$LIBERTY_VERSION" \ + org.opencontainers.image.revision="$LIBERTY_BUILD_LABEL" \ + vendor="Open Liberty" \ + name="Open Liberty" \ + version="$LIBERTY_VERSION" \ + summary="Image for Open Liberty with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and UBI 8" \ + description="This image contains the Open Liberty runtime with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and Red Hat UBI 8 as the base OS. For more information on this image please see https://github.com/OpenLiberty/ci.docker#building-an-application-image" + # 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/ol/wlp \ diff --git a/releases/latest/full/Dockerfile.ubi.openjdk8 b/releases/latest/full/Dockerfile.ubi.openjdk8 index 668537447..f19b30c3a 100644 --- a/releases/latest/full/Dockerfile.ubi.openjdk8 +++ b/releases/latest/full/Dockerfile.ubi.openjdk8 @@ -34,18 +34,6 @@ ARG LIBERTY_BUILD_LABEL=replace_with_gm_driver_label ARG OPENJ9_SCC=true ARG VERBOSE=false -LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Melissa Lee, Thomas Watson, Michal Broz, Wendy Raschke" \ - org.opencontainers.image.vendor="Open Liberty" \ - org.opencontainers.image.url="https://openliberty.io/" \ - org.opencontainers.image.source="https://github.com/OpenLiberty/ci.docker" \ - org.opencontainers.image.version="$LIBERTY_VERSION" \ - org.opencontainers.image.revision="$LIBERTY_BUILD_LABEL" \ - vendor="Open Liberty" \ - name="Open Liberty" \ - version="$LIBERTY_VERSION" \ - summary="Image for Open Liberty with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and UBI 8" \ - description="This image contains the Open Liberty runtime with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and Red Hat UBI 8 as the base OS. For more information on this image please see https://github.com/OpenLiberty/ci.docker#building-an-application-image" - COPY NOTICES /opt/ol/NOTICES COPY helpers /opt/ol/helpers COPY fixes/ /opt/ol/fixes/ @@ -79,6 +67,18 @@ 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, Melissa Lee, Thomas Watson, Michal Broz, Wendy Raschke" \ + org.opencontainers.image.vendor="Open Liberty" \ + org.opencontainers.image.url="https://openliberty.io/" \ + org.opencontainers.image.source="https://github.com/OpenLiberty/ci.docker" \ + org.opencontainers.image.version="$LIBERTY_VERSION" \ + org.opencontainers.image.revision="$LIBERTY_BUILD_LABEL" \ + vendor="Open Liberty" \ + name="Open Liberty" \ + version="$LIBERTY_VERSION" \ + summary="Image for Open Liberty with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and UBI 8" \ + description="This image contains the Open Liberty runtime with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and Red Hat UBI 8 as the base OS. For more information on this image please see https://github.com/OpenLiberty/ci.docker#building-an-application-image" + # 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/ol/wlp \ diff --git a/releases/latest/full/Dockerfile.ubuntu.openjdk11 b/releases/latest/full/Dockerfile.ubuntu.openjdk11 index 86fa09a42..1b54a406b 100644 --- a/releases/latest/full/Dockerfile.ubuntu.openjdk11 +++ b/releases/latest/full/Dockerfile.ubuntu.openjdk11 @@ -10,15 +10,6 @@ ARG LIBERTY_BUILD_LABEL=replace_with_gm_driver_label ARG OPENJ9_SCC=true ARG VERBOSE=false -LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Melissa Lee, Thomas Watson, Michal Broz, Wendy Raschke" \ - org.opencontainers.image.vendor="Open Liberty" \ - org.opencontainers.image.url="https://openliberty.io/" \ - org.opencontainers.image.source="https://github.com/OpenLiberty/ci.docker" \ - org.opencontainers.image.revision="$LIBERTY_BUILD_LABEL" \ - org.opencontainers.image.description="This image contains the Open 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://github.com/OpenLiberty/ci.docker#building-an-application-image" \ - org.opencontainers.image.title="Open Liberty" \ - org.opencontainers.image.version="$LIBERTY_VERSION" - COPY NOTICES /opt/ol/NOTICES COPY helpers /opt/ol/helpers COPY fixes/ /opt/ol/fixes/ @@ -52,6 +43,15 @@ 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, Melissa Lee, Thomas Watson, Michal Broz, Wendy Raschke" \ + org.opencontainers.image.vendor="Open Liberty" \ + org.opencontainers.image.url="https://openliberty.io/" \ + org.opencontainers.image.source="https://github.com/OpenLiberty/ci.docker" \ + org.opencontainers.image.revision="$LIBERTY_BUILD_LABEL" \ + org.opencontainers.image.description="This image contains the Open 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://github.com/OpenLiberty/ci.docker#building-an-application-image" \ + org.opencontainers.image.title="Open Liberty" \ + org.opencontainers.image.version="$LIBERTY_VERSION" + # Install Open Liberty RUN apt-get update \ && apt-get install -y --no-install-recommends unzip openssl wget \ diff --git a/releases/latest/full/Dockerfile.ubuntu.openjdk17 b/releases/latest/full/Dockerfile.ubuntu.openjdk17 index 9c8776549..1b42ecd4d 100644 --- a/releases/latest/full/Dockerfile.ubuntu.openjdk17 +++ b/releases/latest/full/Dockerfile.ubuntu.openjdk17 @@ -10,15 +10,6 @@ ARG LIBERTY_BUILD_LABEL=replace_with_gm_driver_label ARG OPENJ9_SCC=true ARG VERBOSE=false -LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Melissa Lee, Thomas Watson, Michal Broz, Wendy Raschke" \ - org.opencontainers.image.vendor="Open Liberty" \ - org.opencontainers.image.url="https://openliberty.io/" \ - org.opencontainers.image.source="https://github.com/OpenLiberty/ci.docker" \ - org.opencontainers.image.revision="$LIBERTY_BUILD_LABEL" \ - org.opencontainers.image.description="This image contains the Open 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://github.com/OpenLiberty/ci.docker#building-an-application-image" \ - org.opencontainers.image.title="Open Liberty" \ - org.opencontainers.image.version="$LIBERTY_VERSION" - COPY NOTICES /opt/ol/NOTICES COPY helpers /opt/ol/helpers COPY fixes/ /opt/ol/fixes/ @@ -52,6 +43,15 @@ 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, Melissa Lee, Thomas Watson, Michal Broz, Wendy Raschke" \ + org.opencontainers.image.vendor="Open Liberty" \ + org.opencontainers.image.url="https://openliberty.io/" \ + org.opencontainers.image.source="https://github.com/OpenLiberty/ci.docker" \ + org.opencontainers.image.revision="$LIBERTY_BUILD_LABEL" \ + org.opencontainers.image.description="This image contains the Open 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://github.com/OpenLiberty/ci.docker#building-an-application-image" \ + org.opencontainers.image.title="Open Liberty" \ + org.opencontainers.image.version="$LIBERTY_VERSION" + # Install Open Liberty RUN apt-get update \ && apt-get install -y --no-install-recommends unzip openssl wget \ diff --git a/releases/latest/full/Dockerfile.ubuntu.openjdk8 b/releases/latest/full/Dockerfile.ubuntu.openjdk8 index dc5dd87af..9ad909dec 100644 --- a/releases/latest/full/Dockerfile.ubuntu.openjdk8 +++ b/releases/latest/full/Dockerfile.ubuntu.openjdk8 @@ -10,15 +10,6 @@ ARG LIBERTY_BUILD_LABEL=replace_with_gm_driver_label ARG OPENJ9_SCC=true ARG VERBOSE=false -LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Melissa Lee, Thomas Watson, Michal Broz, Wendy Raschke" \ - org.opencontainers.image.vendor="Open Liberty" \ - org.opencontainers.image.url="https://openliberty.io/" \ - org.opencontainers.image.source="https://github.com/OpenLiberty/ci.docker" \ - org.opencontainers.image.revision="$LIBERTY_BUILD_LABEL" \ - org.opencontainers.image.description="This image contains the Open 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://github.com/OpenLiberty/ci.docker#building-an-application-image" \ - org.opencontainers.image.title="Open Liberty" \ - org.opencontainers.image.version="$LIBERTY_VERSION" - COPY NOTICES /opt/ol/NOTICES COPY helpers /opt/ol/helpers COPY fixes/ /opt/ol/fixes/ @@ -52,6 +43,15 @@ 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, Melissa Lee, Thomas Watson, Michal Broz, Wendy Raschke" \ + org.opencontainers.image.vendor="Open Liberty" \ + org.opencontainers.image.url="https://openliberty.io/" \ + org.opencontainers.image.source="https://github.com/OpenLiberty/ci.docker" \ + org.opencontainers.image.revision="$LIBERTY_BUILD_LABEL" \ + org.opencontainers.image.description="This image contains the Open 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://github.com/OpenLiberty/ci.docker#building-an-application-image" \ + org.opencontainers.image.title="Open Liberty" \ + org.opencontainers.image.version="$LIBERTY_VERSION" + # Install Open Liberty RUN apt-get update \ && apt-get install -y --no-install-recommends unzip openssl wget \ diff --git a/releases/latest/kernel-slim/Dockerfile.ubi.ibmjava8 b/releases/latest/kernel-slim/Dockerfile.ubi.ibmjava8 index 9e33c7261..7e9c39199 100644 --- a/releases/latest/kernel-slim/Dockerfile.ubi.ibmjava8 +++ b/releases/latest/kernel-slim/Dockerfile.ubi.ibmjava8 @@ -34,18 +34,6 @@ ARG LIBERTY_BUILD_LABEL=replace_with_gm_driver_label ARG OPENJ9_SCC=true ARG VERBOSE=false -LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Melissa Lee, Thomas Watson, Michal Broz, Wendy Raschke" \ - org.opencontainers.image.vendor="Open Liberty" \ - org.opencontainers.image.url="https://openliberty.io/" \ - org.opencontainers.image.source="https://github.com/OpenLiberty/ci.docker" \ - org.opencontainers.image.version="$LIBERTY_VERSION" \ - org.opencontainers.image.revision="$LIBERTY_BUILD_LABEL" \ - vendor="Open Liberty" \ - name="Open Liberty" \ - version="$LIBERTY_VERSION" \ - summary="Image for Open Liberty with IBM's Java and UBI 8" \ - description="This image contains the Open Liberty runtime with IBM's Java and Red Hat UBI 8 as the base OS. For more information on this image please see https://github.com/OpenLiberty/ci.docker#building-an-application-image" - COPY NOTICES /opt/ol/NOTICES COPY helpers /opt/ol/helpers COPY fixes/ /opt/ol/fixes/ @@ -79,6 +67,18 @@ 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, Melissa Lee, Thomas Watson, Michal Broz, Wendy Raschke" \ + org.opencontainers.image.vendor="Open Liberty" \ + org.opencontainers.image.url="https://openliberty.io/" \ + org.opencontainers.image.source="https://github.com/OpenLiberty/ci.docker" \ + org.opencontainers.image.version="$LIBERTY_VERSION" \ + org.opencontainers.image.revision="$LIBERTY_BUILD_LABEL" \ + vendor="Open Liberty" \ + name="Open Liberty" \ + version="$LIBERTY_VERSION" \ + summary="Image for Open Liberty with IBM's Java and UBI 8" \ + description="This image contains the Open Liberty runtime with IBM's Java and Red Hat UBI 8 as the base OS. For more information on this image please see https://github.com/OpenLiberty/ci.docker#building-an-application-image" + # 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/ol/wlp \ diff --git a/releases/latest/kernel-slim/Dockerfile.ubi.openjdk11 b/releases/latest/kernel-slim/Dockerfile.ubi.openjdk11 index 3f5918551..42724be6e 100644 --- a/releases/latest/kernel-slim/Dockerfile.ubi.openjdk11 +++ b/releases/latest/kernel-slim/Dockerfile.ubi.openjdk11 @@ -34,18 +34,6 @@ ARG LIBERTY_BUILD_LABEL=replace_with_gm_driver_label ARG OPENJ9_SCC=true ARG VERBOSE=false -LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Melissa Lee, Thomas Watson, Michal Broz, Wendy Raschke" \ - org.opencontainers.image.vendor="Open Liberty" \ - org.opencontainers.image.url="https://openliberty.io/" \ - org.opencontainers.image.source="https://github.com/OpenLiberty/ci.docker" \ - org.opencontainers.image.version="$LIBERTY_VERSION" \ - org.opencontainers.image.revision="$LIBERTY_BUILD_LABEL" \ - vendor="Open Liberty" \ - name="Open Liberty" \ - version="$LIBERTY_VERSION" \ - summary="Image for Open Liberty with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and UBI 8" \ - description="This image contains the Open Liberty runtime with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and Red Hat UBI 8 as the base OS. For more information on this image please see https://github.com/OpenLiberty/ci.docker#building-an-application-image" - COPY NOTICES /opt/ol/NOTICES COPY helpers /opt/ol/helpers COPY fixes/ /opt/ol/fixes/ @@ -79,6 +67,18 @@ 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, Melissa Lee, Thomas Watson, Michal Broz, Wendy Raschke" \ + org.opencontainers.image.vendor="Open Liberty" \ + org.opencontainers.image.url="https://openliberty.io/" \ + org.opencontainers.image.source="https://github.com/OpenLiberty/ci.docker" \ + org.opencontainers.image.version="$LIBERTY_VERSION" \ + org.opencontainers.image.revision="$LIBERTY_BUILD_LABEL" \ + vendor="Open Liberty" \ + name="Open Liberty" \ + version="$LIBERTY_VERSION" \ + summary="Image for Open Liberty with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and UBI 8" \ + description="This image contains the Open Liberty runtime with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and Red Hat UBI 8 as the base OS. For more information on this image please see https://github.com/OpenLiberty/ci.docker#building-an-application-image" + # 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/ol/wlp \ diff --git a/releases/latest/kernel-slim/Dockerfile.ubi.openjdk17 b/releases/latest/kernel-slim/Dockerfile.ubi.openjdk17 index a07b50e9c..7f525fb50 100644 --- a/releases/latest/kernel-slim/Dockerfile.ubi.openjdk17 +++ b/releases/latest/kernel-slim/Dockerfile.ubi.openjdk17 @@ -34,18 +34,6 @@ ARG LIBERTY_BUILD_LABEL=replace_with_gm_driver_label ARG OPENJ9_SCC=true ARG VERBOSE=false -LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Melissa Lee, Thomas Watson, Michal Broz, Wendy Raschke" \ - org.opencontainers.image.vendor="Open Liberty" \ - org.opencontainers.image.url="https://openliberty.io/" \ - org.opencontainers.image.source="https://github.com/OpenLiberty/ci.docker" \ - org.opencontainers.image.version="$LIBERTY_VERSION" \ - org.opencontainers.image.revision="$LIBERTY_BUILD_LABEL" \ - vendor="Open Liberty" \ - name="Open Liberty" \ - version="$LIBERTY_VERSION" \ - summary="Image for Open Liberty with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and UBI 8" \ - description="This image contains the Open Liberty runtime with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and Red Hat UBI 8 as the base OS. For more information on this image please see https://github.com/OpenLiberty/ci.docker#building-an-application-image" - COPY NOTICES /opt/ol/NOTICES COPY helpers /opt/ol/helpers COPY fixes/ /opt/ol/fixes/ @@ -79,6 +67,18 @@ 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, Melissa Lee, Thomas Watson, Michal Broz, Wendy Raschke" \ + org.opencontainers.image.vendor="Open Liberty" \ + org.opencontainers.image.url="https://openliberty.io/" \ + org.opencontainers.image.source="https://github.com/OpenLiberty/ci.docker" \ + org.opencontainers.image.version="$LIBERTY_VERSION" \ + org.opencontainers.image.revision="$LIBERTY_BUILD_LABEL" \ + vendor="Open Liberty" \ + name="Open Liberty" \ + version="$LIBERTY_VERSION" \ + summary="Image for Open Liberty with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and UBI 8" \ + description="This image contains the Open Liberty runtime with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and Red Hat UBI 8 as the base OS. For more information on this image please see https://github.com/OpenLiberty/ci.docker#building-an-application-image" + # 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/ol/wlp \ diff --git a/releases/latest/kernel-slim/Dockerfile.ubi.openjdk8 b/releases/latest/kernel-slim/Dockerfile.ubi.openjdk8 index 22917861f..bfc43d0e0 100644 --- a/releases/latest/kernel-slim/Dockerfile.ubi.openjdk8 +++ b/releases/latest/kernel-slim/Dockerfile.ubi.openjdk8 @@ -34,18 +34,6 @@ ARG LIBERTY_BUILD_LABEL=replace_with_gm_driver_label ARG OPENJ9_SCC=true ARG VERBOSE=false -LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Melissa Lee, Thomas Watson, Michal Broz, Wendy Raschke" \ - org.opencontainers.image.vendor="Open Liberty" \ - org.opencontainers.image.url="https://openliberty.io/" \ - org.opencontainers.image.source="https://github.com/OpenLiberty/ci.docker" \ - org.opencontainers.image.version="$LIBERTY_VERSION" \ - org.opencontainers.image.revision="$LIBERTY_BUILD_LABEL" \ - vendor="Open Liberty" \ - name="Open Liberty" \ - version="$LIBERTY_VERSION" \ - summary="Image for Open Liberty with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and UBI 8" \ - description="This image contains the Open Liberty runtime with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and Red Hat UBI 8 as the base OS. For more information on this image please see https://github.com/OpenLiberty/ci.docker#building-an-application-image" - COPY NOTICES /opt/ol/NOTICES COPY helpers /opt/ol/helpers COPY fixes/ /opt/ol/fixes/ @@ -79,6 +67,18 @@ 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, Melissa Lee, Thomas Watson, Michal Broz, Wendy Raschke" \ + org.opencontainers.image.vendor="Open Liberty" \ + org.opencontainers.image.url="https://openliberty.io/" \ + org.opencontainers.image.source="https://github.com/OpenLiberty/ci.docker" \ + org.opencontainers.image.version="$LIBERTY_VERSION" \ + org.opencontainers.image.revision="$LIBERTY_BUILD_LABEL" \ + vendor="Open Liberty" \ + name="Open Liberty" \ + version="$LIBERTY_VERSION" \ + summary="Image for Open Liberty with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and UBI 8" \ + description="This image contains the Open Liberty runtime with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and Red Hat UBI 8 as the base OS. For more information on this image please see https://github.com/OpenLiberty/ci.docker#building-an-application-image" + # 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/ol/wlp \ diff --git a/releases/latest/kernel-slim/Dockerfile.ubuntu.openjdk11 b/releases/latest/kernel-slim/Dockerfile.ubuntu.openjdk11 index 54041c340..1fac2f148 100644 --- a/releases/latest/kernel-slim/Dockerfile.ubuntu.openjdk11 +++ b/releases/latest/kernel-slim/Dockerfile.ubuntu.openjdk11 @@ -10,15 +10,6 @@ ARG LIBERTY_BUILD_LABEL=replace_with_gm_driver_label ARG OPENJ9_SCC=true ARG VERBOSE=false -LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Melissa Lee, Thomas Watson, Michal Broz, Wendy Raschke" \ - org.opencontainers.image.vendor="Open Liberty" \ - org.opencontainers.image.url="https://openliberty.io/" \ - org.opencontainers.image.source="https://github.com/OpenLiberty/ci.docker" \ - org.opencontainers.image.revision="$LIBERTY_BUILD_LABEL" \ - org.opencontainers.image.description="This image contains the Open 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://github.com/OpenLiberty/ci.docker#building-an-application-image" \ - org.opencontainers.image.title="Open Liberty" \ - org.opencontainers.image.version="$LIBERTY_VERSION" - COPY NOTICES /opt/ol/NOTICES COPY helpers /opt/ol/helpers COPY fixes/ /opt/ol/fixes/ @@ -52,6 +43,15 @@ 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, Melissa Lee, Thomas Watson, Michal Broz, Wendy Raschke" \ + org.opencontainers.image.vendor="Open Liberty" \ + org.opencontainers.image.url="https://openliberty.io/" \ + org.opencontainers.image.source="https://github.com/OpenLiberty/ci.docker" \ + org.opencontainers.image.revision="$LIBERTY_BUILD_LABEL" \ + org.opencontainers.image.description="This image contains the Open 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://github.com/OpenLiberty/ci.docker#building-an-application-image" \ + org.opencontainers.image.title="Open Liberty" \ + org.opencontainers.image.version="$LIBERTY_VERSION" + # Install Open Liberty RUN apt-get update \ && apt-get install -y --no-install-recommends unzip openssl wget \ diff --git a/releases/latest/kernel-slim/Dockerfile.ubuntu.openjdk17 b/releases/latest/kernel-slim/Dockerfile.ubuntu.openjdk17 index f7c3143a4..99bc4c8fa 100644 --- a/releases/latest/kernel-slim/Dockerfile.ubuntu.openjdk17 +++ b/releases/latest/kernel-slim/Dockerfile.ubuntu.openjdk17 @@ -10,15 +10,6 @@ ARG LIBERTY_BUILD_LABEL=replace_with_gm_driver_label ARG OPENJ9_SCC=true ARG VERBOSE=false -LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Melissa Lee, Thomas Watson, Michal Broz, Wendy Raschke" \ - org.opencontainers.image.vendor="Open Liberty" \ - org.opencontainers.image.url="https://openliberty.io/" \ - org.opencontainers.image.source="https://github.com/OpenLiberty/ci.docker" \ - org.opencontainers.image.revision="$LIBERTY_BUILD_LABEL" \ - org.opencontainers.image.description="This image contains the Open 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://github.com/OpenLiberty/ci.docker#building-an-application-image" \ - org.opencontainers.image.title="Open Liberty" \ - org.opencontainers.image.version="$LIBERTY_VERSION" - COPY NOTICES /opt/ol/NOTICES COPY helpers /opt/ol/helpers COPY fixes/ /opt/ol/fixes/ @@ -52,6 +43,15 @@ 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, Melissa Lee, Thomas Watson, Michal Broz, Wendy Raschke" \ + org.opencontainers.image.vendor="Open Liberty" \ + org.opencontainers.image.url="https://openliberty.io/" \ + org.opencontainers.image.source="https://github.com/OpenLiberty/ci.docker" \ + org.opencontainers.image.revision="$LIBERTY_BUILD_LABEL" \ + org.opencontainers.image.description="This image contains the Open 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://github.com/OpenLiberty/ci.docker#building-an-application-image" \ + org.opencontainers.image.title="Open Liberty" \ + org.opencontainers.image.version="$LIBERTY_VERSION" + # Install Open Liberty RUN apt-get update \ && apt-get install -y --no-install-recommends unzip openssl wget \ diff --git a/releases/latest/kernel-slim/Dockerfile.ubuntu.openjdk8 b/releases/latest/kernel-slim/Dockerfile.ubuntu.openjdk8 index b9047363a..850642b6c 100644 --- a/releases/latest/kernel-slim/Dockerfile.ubuntu.openjdk8 +++ b/releases/latest/kernel-slim/Dockerfile.ubuntu.openjdk8 @@ -10,15 +10,6 @@ ARG LIBERTY_BUILD_LABEL=replace_with_gm_driver_label ARG OPENJ9_SCC=true ARG VERBOSE=false -LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Melissa Lee, Thomas Watson, Michal Broz, Wendy Raschke" \ - org.opencontainers.image.vendor="Open Liberty" \ - org.opencontainers.image.url="https://openliberty.io/" \ - org.opencontainers.image.source="https://github.com/OpenLiberty/ci.docker" \ - org.opencontainers.image.revision="$LIBERTY_BUILD_LABEL" \ - org.opencontainers.image.description="This image contains the Open 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://github.com/OpenLiberty/ci.docker#building-an-application-image" \ - org.opencontainers.image.title="Open Liberty" \ - org.opencontainers.image.version="$LIBERTY_VERSION" - COPY NOTICES /opt/ol/NOTICES COPY helpers /opt/ol/helpers COPY fixes/ /opt/ol/fixes/ @@ -52,6 +43,15 @@ 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, Melissa Lee, Thomas Watson, Michal Broz, Wendy Raschke" \ + org.opencontainers.image.vendor="Open Liberty" \ + org.opencontainers.image.url="https://openliberty.io/" \ + org.opencontainers.image.source="https://github.com/OpenLiberty/ci.docker" \ + org.opencontainers.image.revision="$LIBERTY_BUILD_LABEL" \ + org.opencontainers.image.description="This image contains the Open 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://github.com/OpenLiberty/ci.docker#building-an-application-image" \ + org.opencontainers.image.title="Open Liberty" \ + org.opencontainers.image.version="$LIBERTY_VERSION" + # Install Open Liberty RUN apt-get update \ && apt-get install -y --no-install-recommends unzip openssl wget \