From 5bdaae9ed00d6d4125adb5b79dad47297b1ef91b Mon Sep 17 00:00:00 2001 From: ilewis Date: Mon, 5 Feb 2024 14:40:14 +0000 Subject: [PATCH 1/2] Add sha validation for wlp.zip on latest --- ga/latest/kernel/Dockerfile.ubi.ibmjava8 | 3 +++ ga/latest/kernel/Dockerfile.ubi.openjdk11 | 4 ++++ ga/latest/kernel/Dockerfile.ubi.openjdk17 | 3 +++ ga/latest/kernel/Dockerfile.ubi.openjdk21 | 3 +++ ga/latest/kernel/Dockerfile.ubi.openjdk8 | 3 +++ ga/latest/kernel/Dockerfile.ubuntu.ibmjava8 | 3 +++ ga/latest/kernel/Dockerfile.ubuntu.openjdk11 | 3 +++ ga/latest/kernel/Dockerfile.ubuntu.openjdk17 | 3 +++ 8 files changed, 25 insertions(+) diff --git a/ga/latest/kernel/Dockerfile.ubi.ibmjava8 b/ga/latest/kernel/Dockerfile.ubi.ibmjava8 index df897d462..ea3ff99de 100644 --- a/ga/latest/kernel/Dockerfile.ubi.ibmjava8 +++ b/ga/latest/kernel/Dockerfile.ubi.ibmjava8 @@ -22,6 +22,7 @@ ARG VERBOSE=false ARG LIBERTY_VERSION=24.0.0.2 ARG LIBERTY_URL ARG DOWNLOAD_OPTIONS="" +ARG LIBERTY_SHA={replace_with_correct_sha} # If there is a local copy of the image use that instead COPY resources/ /tmp/ @@ -32,6 +33,8 @@ RUN yum -y install unzip wget openssl \ && useradd -u 1001 -r -g 0 -s /usr/sbin/nologin default \ && LIBERTY_URL=${LIBERTY_URL:-$(wget -q -O - https://public.dhe.ibm.com/ibmdl/export/pub/software/websphere/wasdev/downloads/wlp/index.yml | grep -E "^\s*kernel:.*${LIBERTY_VERSION}\.zip" | sed -n 's/\s*kernel:\s//p' | tr -d '\r' )} \ && if [ ! -f /tmp/wlp.zip ]; then wget $DOWNLOAD_OPTIONS $LIBERTY_URL -U UA-IBM-WebSphere-Liberty-Docker -O /tmp/wlp.zip; fi \ + && echo "$LIBERTY_SHA /tmp/wlp.zip" > /tmp/wlp.zip.sha1 \ + && sha1sum -c /tmp/wlp.zip.sha1 \ && chmod -R g+x /usr/bin \ && unzip -q /tmp/wlp.zip -d /opt/ibm \ && chown -R 1001:0 /opt/ibm/wlp \ diff --git a/ga/latest/kernel/Dockerfile.ubi.openjdk11 b/ga/latest/kernel/Dockerfile.ubi.openjdk11 index 8f50b828c..e1695f256 100644 --- a/ga/latest/kernel/Dockerfile.ubi.openjdk11 +++ b/ga/latest/kernel/Dockerfile.ubi.openjdk11 @@ -22,6 +22,8 @@ ARG VERBOSE=false ARG LIBERTY_VERSION=24.0.0.2 ARG LIBERTY_URL ARG DOWNLOAD_OPTIONS="" +ARG LIBERTY_SHA={replace_with_correct_sha} + # If there is a local copy of the image use that instead COPY resources/ /tmp/ @@ -32,6 +34,8 @@ RUN yum -y install shadow-utils unzip wget findutils openssl \ && useradd -u 1001 -r -g 0 -s /usr/sbin/nologin default \ && LIBERTY_URL=${LIBERTY_URL:-$(wget -q -O - https://public.dhe.ibm.com/ibmdl/export/pub/software/websphere/wasdev/downloads/wlp/index.yml | grep -E "^\s*kernel:.*${LIBERTY_VERSION}\.zip" | sed -n 's/\s*kernel:\s//p' | tr -d '\r' )} \ && if [ ! -f /tmp/wlp.zip ]; then wget $DOWNLOAD_OPTIONS $LIBERTY_URL -U UA-IBM-WebSphere-Liberty-Docker -O /tmp/wlp.zip; fi \ + && echo "$LIBERTY_SHA /tmp/wlp.zip" > /tmp/wlp.zip.sha1 \ + && sha1sum -c /tmp/wlp.zip.sha1 \ && chmod -R g+x /usr/bin \ && unzip -q /tmp/wlp.zip -d /opt/ibm \ && chown -R 1001:0 /opt/ibm/wlp \ diff --git a/ga/latest/kernel/Dockerfile.ubi.openjdk17 b/ga/latest/kernel/Dockerfile.ubi.openjdk17 index 0cf6168be..a4fb97a53 100644 --- a/ga/latest/kernel/Dockerfile.ubi.openjdk17 +++ b/ga/latest/kernel/Dockerfile.ubi.openjdk17 @@ -22,6 +22,7 @@ ARG VERBOSE=false ARG LIBERTY_VERSION=24.0.0.2 ARG LIBERTY_URL ARG DOWNLOAD_OPTIONS="" +ARG LIBERTY_SHA={replace_with_correct_sha} # If there is a local copy of the image use that instead COPY resources/ /tmp/ @@ -32,6 +33,8 @@ RUN yum -y install shadow-utils unzip wget findutils openssl \ && useradd -u 1001 -r -g 0 -s /usr/sbin/nologin default \ && LIBERTY_URL=${LIBERTY_URL:-$(wget -q -O - https://public.dhe.ibm.com/ibmdl/export/pub/software/websphere/wasdev/downloads/wlp/index.yml | grep -E "^\s*kernel:.*${LIBERTY_VERSION}\.zip" | sed -n 's/\s*kernel:\s//p' | tr -d '\r' )} \ && if [ ! -f /tmp/wlp.zip ]; then wget $DOWNLOAD_OPTIONS $LIBERTY_URL -U UA-IBM-WebSphere-Liberty-Docker -O /tmp/wlp.zip; fi \ + && echo "$LIBERTY_SHA /tmp/wlp.zip" > /tmp/wlp.zip.sha1 \ + && sha1sum -c /tmp/wlp.zip.sha1 \ && chmod -R g+x /usr/bin \ && unzip -q /tmp/wlp.zip -d /opt/ibm \ && chown -R 1001:0 /opt/ibm/wlp \ diff --git a/ga/latest/kernel/Dockerfile.ubi.openjdk21 b/ga/latest/kernel/Dockerfile.ubi.openjdk21 index 10786dfa3..b1f1f4299 100644 --- a/ga/latest/kernel/Dockerfile.ubi.openjdk21 +++ b/ga/latest/kernel/Dockerfile.ubi.openjdk21 @@ -22,6 +22,7 @@ ARG VERBOSE=false ARG LIBERTY_VERSION=24.0.0.2 ARG LIBERTY_URL ARG DOWNLOAD_OPTIONS="" +ARG LIBERTY_SHA={replace_with_correct_sha} # If there is a local copy of the image use that instead COPY resources/ /tmp/ @@ -31,6 +32,8 @@ RUN microdnf -y install shadow-utils unzip wget findutils openssl \ && useradd -u 1001 -r -g 0 -s /usr/sbin/nologin default \ && LIBERTY_URL=${LIBERTY_URL:-$(wget -q -O - https://public.dhe.ibm.com/ibmdl/export/pub/software/websphere/wasdev/downloads/wlp/index.yml | grep -E "^\s*kernel:.*${LIBERTY_VERSION}\.zip" | sed -n 's/\s*kernel:\s//p' | tr -d '\r' )} \ && if [ ! -f /tmp/wlp.zip ]; then wget $DOWNLOAD_OPTIONS $LIBERTY_URL -U UA-IBM-WebSphere-Liberty-Docker -O /tmp/wlp.zip; fi \ + && echo "$LIBERTY_SHA /tmp/wlp.zip" > /tmp/wlp.zip.sha1 \ + && sha1sum -c /tmp/wlp.zip.sha1 \ && chmod -R g+x /usr/bin \ && unzip -q /tmp/wlp.zip -d /opt/ibm \ && chown -R 1001:0 /opt/ibm/wlp \ diff --git a/ga/latest/kernel/Dockerfile.ubi.openjdk8 b/ga/latest/kernel/Dockerfile.ubi.openjdk8 index 1ecc34d42..5b93a6ab6 100644 --- a/ga/latest/kernel/Dockerfile.ubi.openjdk8 +++ b/ga/latest/kernel/Dockerfile.ubi.openjdk8 @@ -22,6 +22,7 @@ ARG VERBOSE=false ARG LIBERTY_VERSION=24.0.0.2 ARG LIBERTY_URL ARG DOWNLOAD_OPTIONS="" +ARG LIBERTY_SHA={replace_with_correct_sha} # If there is a local copy of the image use that instead COPY resources/ /tmp/ @@ -32,6 +33,8 @@ RUN yum -y install shadow-utils unzip wget findutils openssl \ && useradd -u 1001 -r -g 0 -s /usr/sbin/nologin default \ && LIBERTY_URL=${LIBERTY_URL:-$(wget -q -O - https://public.dhe.ibm.com/ibmdl/export/pub/software/websphere/wasdev/downloads/wlp/index.yml | grep -E "^\s*kernel:.*${LIBERTY_VERSION}\.zip" | sed -n 's/\s*kernel:\s//p' | tr -d '\r' )} \ && if [ ! -f /tmp/wlp.zip ]; then wget $DOWNLOAD_OPTIONS $LIBERTY_URL -U UA-IBM-WebSphere-Liberty-Docker -O /tmp/wlp.zip; fi \ + && echo "$LIBERTY_SHA /tmp/wlp.zip" > /tmp/wlp.zip.sha1 \ + && sha1sum -c /tmp/wlp.zip.sha1 \ && chmod -R g+x /usr/bin \ && unzip -q /tmp/wlp.zip -d /opt/ibm \ && chown -R 1001:0 /opt/ibm/wlp \ diff --git a/ga/latest/kernel/Dockerfile.ubuntu.ibmjava8 b/ga/latest/kernel/Dockerfile.ubuntu.ibmjava8 index 2bdbefaaf..b1b8314ef 100644 --- a/ga/latest/kernel/Dockerfile.ubuntu.ibmjava8 +++ b/ga/latest/kernel/Dockerfile.ubuntu.ibmjava8 @@ -21,6 +21,7 @@ ARG OPENJ9_SCC=true ARG LIBERTY_VERSION=24.0.0.2 ARG LIBERTY_BUILD_LABEL={replace_with_gm_driver_label} +ARG LIBERTY_SHA={replace_with_correct_sha} LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Thomas Watson, Wendy Raschke, Michal Broz" \ org.opencontainers.image.vendor="IBM" \ @@ -83,6 +84,8 @@ RUN apt-get update \ && useradd -u 1001 -r -g 0 -s /usr/sbin/nologin default \ && LIBERTY_URL=${LIBERTY_URL:-$(wget -q -O - https://public.dhe.ibm.com/ibmdl/export/pub/software/websphere/wasdev/downloads/wlp/index.yml | grep -E "^\s*kernel:.*${LIBERTY_VERSION}\.zip" | sed -n 's/\s*kernel:\s//p' | tr -d '\r' )} \ && wget $DOWNLOAD_OPTIONS $LIBERTY_URL -U UA-IBM-WebSphere-Liberty-Docker -O /tmp/wlp.zip \ + && echo "$LIBERTY_SHA /tmp/wlp.zip" > /tmp/wlp.zip.sha1 \ + && sha1sum -c /tmp/wlp.zip.sha1 \ && unzip -q /tmp/wlp.zip -d /opt/ibm \ && rm /tmp/wlp.zip \ && chown -R 1001:0 /opt/ibm/wlp \ diff --git a/ga/latest/kernel/Dockerfile.ubuntu.openjdk11 b/ga/latest/kernel/Dockerfile.ubuntu.openjdk11 index 674d7898f..10890369b 100644 --- a/ga/latest/kernel/Dockerfile.ubuntu.openjdk11 +++ b/ga/latest/kernel/Dockerfile.ubuntu.openjdk11 @@ -21,6 +21,7 @@ ARG OPENJ9_SCC=true ARG LIBERTY_VERSION=24.0.0.2 ARG LIBERTY_BUILD_LABEL={replace_with_gm_driver_label} +ARG LIBERTY_SHA={replace_with_correct_sha} LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Thomas Watson, Wendy Raschke, Michal Broz" \ org.opencontainers.image.vendor="IBM" \ @@ -78,6 +79,8 @@ RUN apt-get update \ && useradd -u 1001 -r -g 0 -s /usr/sbin/nologin default \ && LIBERTY_URL=${LIBERTY_URL:-$(wget -q -O - https://public.dhe.ibm.com/ibmdl/export/pub/software/websphere/wasdev/downloads/wlp/index.yml | grep -E "^\s*kernel:.*${LIBERTY_VERSION}\.zip" | sed -n 's/\s*kernel:\s//p' | tr -d '\r' )} \ && wget $DOWNLOAD_OPTIONS $LIBERTY_URL -U UA-IBM-WebSphere-Liberty-Docker -O /tmp/wlp.zip \ + && echo "$LIBERTY_SHA /tmp/wlp.zip" > /tmp/wlp.zip.sha1 \ + && sha1sum -c /tmp/wlp.zip.sha1 \ && unzip -q /tmp/wlp.zip -d /opt/ibm \ && rm /tmp/wlp.zip \ && chown -R 1001:0 /opt/ibm/wlp \ diff --git a/ga/latest/kernel/Dockerfile.ubuntu.openjdk17 b/ga/latest/kernel/Dockerfile.ubuntu.openjdk17 index 10d42b099..c0bd32808 100644 --- a/ga/latest/kernel/Dockerfile.ubuntu.openjdk17 +++ b/ga/latest/kernel/Dockerfile.ubuntu.openjdk17 @@ -21,6 +21,7 @@ ARG OPENJ9_SCC=true ARG LIBERTY_VERSION=24.0.0.2 ARG LIBERTY_BUILD_LABEL={replace_with_gm_driver_label} +ARG LIBERTY_SHA={replace_with_correct_sha} LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Thomas Watson, Wendy Raschke, Michal Broz" \ org.opencontainers.image.vendor="IBM" \ @@ -78,6 +79,8 @@ RUN apt-get update \ && useradd -u 1001 -r -g 0 -s /usr/sbin/nologin default \ && LIBERTY_URL=${LIBERTY_URL:-$(wget -q -O - https://public.dhe.ibm.com/ibmdl/export/pub/software/websphere/wasdev/downloads/wlp/index.yml | grep -E "^\s*kernel:.*${LIBERTY_VERSION}\.zip" | sed -n 's/\s*kernel:\s//p' | tr -d '\r' )} \ && wget $DOWNLOAD_OPTIONS $LIBERTY_URL -U UA-IBM-WebSphere-Liberty-Docker -O /tmp/wlp.zip \ + && echo "$LIBERTY_SHA /tmp/wlp.zip" > /tmp/wlp.zip.sha1 \ + && sha1sum -c /tmp/wlp.zip.sha1 \ && unzip -q /tmp/wlp.zip -d /opt/ibm \ && rm /tmp/wlp.zip \ && chown -R 1001:0 /opt/ibm/wlp \ From 95574d53f55ed9aa95d79b592b1d95cb63924f33 Mon Sep 17 00:00:00 2001 From: ilewis Date: Mon, 5 Feb 2024 14:44:23 +0000 Subject: [PATCH 2/2] Add sha validation for wlp.zip on 24.0.0.2 --- ga/24.0.0.2/kernel/Dockerfile.ubi.ibmjava8 | 3 +++ ga/24.0.0.2/kernel/Dockerfile.ubi.openjdk11 | 4 ++++ ga/24.0.0.2/kernel/Dockerfile.ubi.openjdk17 | 3 +++ ga/24.0.0.2/kernel/Dockerfile.ubi.openjdk21 | 3 +++ ga/24.0.0.2/kernel/Dockerfile.ubi.openjdk8 | 3 +++ ga/24.0.0.2/kernel/Dockerfile.ubuntu.ibmjava8 | 3 +++ ga/24.0.0.2/kernel/Dockerfile.ubuntu.openjdk11 | 3 +++ ga/24.0.0.2/kernel/Dockerfile.ubuntu.openjdk17 | 3 +++ 8 files changed, 25 insertions(+) diff --git a/ga/24.0.0.2/kernel/Dockerfile.ubi.ibmjava8 b/ga/24.0.0.2/kernel/Dockerfile.ubi.ibmjava8 index df897d462..ea3ff99de 100644 --- a/ga/24.0.0.2/kernel/Dockerfile.ubi.ibmjava8 +++ b/ga/24.0.0.2/kernel/Dockerfile.ubi.ibmjava8 @@ -22,6 +22,7 @@ ARG VERBOSE=false ARG LIBERTY_VERSION=24.0.0.2 ARG LIBERTY_URL ARG DOWNLOAD_OPTIONS="" +ARG LIBERTY_SHA={replace_with_correct_sha} # If there is a local copy of the image use that instead COPY resources/ /tmp/ @@ -32,6 +33,8 @@ RUN yum -y install unzip wget openssl \ && useradd -u 1001 -r -g 0 -s /usr/sbin/nologin default \ && LIBERTY_URL=${LIBERTY_URL:-$(wget -q -O - https://public.dhe.ibm.com/ibmdl/export/pub/software/websphere/wasdev/downloads/wlp/index.yml | grep -E "^\s*kernel:.*${LIBERTY_VERSION}\.zip" | sed -n 's/\s*kernel:\s//p' | tr -d '\r' )} \ && if [ ! -f /tmp/wlp.zip ]; then wget $DOWNLOAD_OPTIONS $LIBERTY_URL -U UA-IBM-WebSphere-Liberty-Docker -O /tmp/wlp.zip; fi \ + && echo "$LIBERTY_SHA /tmp/wlp.zip" > /tmp/wlp.zip.sha1 \ + && sha1sum -c /tmp/wlp.zip.sha1 \ && chmod -R g+x /usr/bin \ && unzip -q /tmp/wlp.zip -d /opt/ibm \ && chown -R 1001:0 /opt/ibm/wlp \ diff --git a/ga/24.0.0.2/kernel/Dockerfile.ubi.openjdk11 b/ga/24.0.0.2/kernel/Dockerfile.ubi.openjdk11 index 8f50b828c..e1695f256 100644 --- a/ga/24.0.0.2/kernel/Dockerfile.ubi.openjdk11 +++ b/ga/24.0.0.2/kernel/Dockerfile.ubi.openjdk11 @@ -22,6 +22,8 @@ ARG VERBOSE=false ARG LIBERTY_VERSION=24.0.0.2 ARG LIBERTY_URL ARG DOWNLOAD_OPTIONS="" +ARG LIBERTY_SHA={replace_with_correct_sha} + # If there is a local copy of the image use that instead COPY resources/ /tmp/ @@ -32,6 +34,8 @@ RUN yum -y install shadow-utils unzip wget findutils openssl \ && useradd -u 1001 -r -g 0 -s /usr/sbin/nologin default \ && LIBERTY_URL=${LIBERTY_URL:-$(wget -q -O - https://public.dhe.ibm.com/ibmdl/export/pub/software/websphere/wasdev/downloads/wlp/index.yml | grep -E "^\s*kernel:.*${LIBERTY_VERSION}\.zip" | sed -n 's/\s*kernel:\s//p' | tr -d '\r' )} \ && if [ ! -f /tmp/wlp.zip ]; then wget $DOWNLOAD_OPTIONS $LIBERTY_URL -U UA-IBM-WebSphere-Liberty-Docker -O /tmp/wlp.zip; fi \ + && echo "$LIBERTY_SHA /tmp/wlp.zip" > /tmp/wlp.zip.sha1 \ + && sha1sum -c /tmp/wlp.zip.sha1 \ && chmod -R g+x /usr/bin \ && unzip -q /tmp/wlp.zip -d /opt/ibm \ && chown -R 1001:0 /opt/ibm/wlp \ diff --git a/ga/24.0.0.2/kernel/Dockerfile.ubi.openjdk17 b/ga/24.0.0.2/kernel/Dockerfile.ubi.openjdk17 index 0cf6168be..a4fb97a53 100644 --- a/ga/24.0.0.2/kernel/Dockerfile.ubi.openjdk17 +++ b/ga/24.0.0.2/kernel/Dockerfile.ubi.openjdk17 @@ -22,6 +22,7 @@ ARG VERBOSE=false ARG LIBERTY_VERSION=24.0.0.2 ARG LIBERTY_URL ARG DOWNLOAD_OPTIONS="" +ARG LIBERTY_SHA={replace_with_correct_sha} # If there is a local copy of the image use that instead COPY resources/ /tmp/ @@ -32,6 +33,8 @@ RUN yum -y install shadow-utils unzip wget findutils openssl \ && useradd -u 1001 -r -g 0 -s /usr/sbin/nologin default \ && LIBERTY_URL=${LIBERTY_URL:-$(wget -q -O - https://public.dhe.ibm.com/ibmdl/export/pub/software/websphere/wasdev/downloads/wlp/index.yml | grep -E "^\s*kernel:.*${LIBERTY_VERSION}\.zip" | sed -n 's/\s*kernel:\s//p' | tr -d '\r' )} \ && if [ ! -f /tmp/wlp.zip ]; then wget $DOWNLOAD_OPTIONS $LIBERTY_URL -U UA-IBM-WebSphere-Liberty-Docker -O /tmp/wlp.zip; fi \ + && echo "$LIBERTY_SHA /tmp/wlp.zip" > /tmp/wlp.zip.sha1 \ + && sha1sum -c /tmp/wlp.zip.sha1 \ && chmod -R g+x /usr/bin \ && unzip -q /tmp/wlp.zip -d /opt/ibm \ && chown -R 1001:0 /opt/ibm/wlp \ diff --git a/ga/24.0.0.2/kernel/Dockerfile.ubi.openjdk21 b/ga/24.0.0.2/kernel/Dockerfile.ubi.openjdk21 index 10786dfa3..b1f1f4299 100644 --- a/ga/24.0.0.2/kernel/Dockerfile.ubi.openjdk21 +++ b/ga/24.0.0.2/kernel/Dockerfile.ubi.openjdk21 @@ -22,6 +22,7 @@ ARG VERBOSE=false ARG LIBERTY_VERSION=24.0.0.2 ARG LIBERTY_URL ARG DOWNLOAD_OPTIONS="" +ARG LIBERTY_SHA={replace_with_correct_sha} # If there is a local copy of the image use that instead COPY resources/ /tmp/ @@ -31,6 +32,8 @@ RUN microdnf -y install shadow-utils unzip wget findutils openssl \ && useradd -u 1001 -r -g 0 -s /usr/sbin/nologin default \ && LIBERTY_URL=${LIBERTY_URL:-$(wget -q -O - https://public.dhe.ibm.com/ibmdl/export/pub/software/websphere/wasdev/downloads/wlp/index.yml | grep -E "^\s*kernel:.*${LIBERTY_VERSION}\.zip" | sed -n 's/\s*kernel:\s//p' | tr -d '\r' )} \ && if [ ! -f /tmp/wlp.zip ]; then wget $DOWNLOAD_OPTIONS $LIBERTY_URL -U UA-IBM-WebSphere-Liberty-Docker -O /tmp/wlp.zip; fi \ + && echo "$LIBERTY_SHA /tmp/wlp.zip" > /tmp/wlp.zip.sha1 \ + && sha1sum -c /tmp/wlp.zip.sha1 \ && chmod -R g+x /usr/bin \ && unzip -q /tmp/wlp.zip -d /opt/ibm \ && chown -R 1001:0 /opt/ibm/wlp \ diff --git a/ga/24.0.0.2/kernel/Dockerfile.ubi.openjdk8 b/ga/24.0.0.2/kernel/Dockerfile.ubi.openjdk8 index 1ecc34d42..5b93a6ab6 100644 --- a/ga/24.0.0.2/kernel/Dockerfile.ubi.openjdk8 +++ b/ga/24.0.0.2/kernel/Dockerfile.ubi.openjdk8 @@ -22,6 +22,7 @@ ARG VERBOSE=false ARG LIBERTY_VERSION=24.0.0.2 ARG LIBERTY_URL ARG DOWNLOAD_OPTIONS="" +ARG LIBERTY_SHA={replace_with_correct_sha} # If there is a local copy of the image use that instead COPY resources/ /tmp/ @@ -32,6 +33,8 @@ RUN yum -y install shadow-utils unzip wget findutils openssl \ && useradd -u 1001 -r -g 0 -s /usr/sbin/nologin default \ && LIBERTY_URL=${LIBERTY_URL:-$(wget -q -O - https://public.dhe.ibm.com/ibmdl/export/pub/software/websphere/wasdev/downloads/wlp/index.yml | grep -E "^\s*kernel:.*${LIBERTY_VERSION}\.zip" | sed -n 's/\s*kernel:\s//p' | tr -d '\r' )} \ && if [ ! -f /tmp/wlp.zip ]; then wget $DOWNLOAD_OPTIONS $LIBERTY_URL -U UA-IBM-WebSphere-Liberty-Docker -O /tmp/wlp.zip; fi \ + && echo "$LIBERTY_SHA /tmp/wlp.zip" > /tmp/wlp.zip.sha1 \ + && sha1sum -c /tmp/wlp.zip.sha1 \ && chmod -R g+x /usr/bin \ && unzip -q /tmp/wlp.zip -d /opt/ibm \ && chown -R 1001:0 /opt/ibm/wlp \ diff --git a/ga/24.0.0.2/kernel/Dockerfile.ubuntu.ibmjava8 b/ga/24.0.0.2/kernel/Dockerfile.ubuntu.ibmjava8 index 2bdbefaaf..b1b8314ef 100644 --- a/ga/24.0.0.2/kernel/Dockerfile.ubuntu.ibmjava8 +++ b/ga/24.0.0.2/kernel/Dockerfile.ubuntu.ibmjava8 @@ -21,6 +21,7 @@ ARG OPENJ9_SCC=true ARG LIBERTY_VERSION=24.0.0.2 ARG LIBERTY_BUILD_LABEL={replace_with_gm_driver_label} +ARG LIBERTY_SHA={replace_with_correct_sha} LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Thomas Watson, Wendy Raschke, Michal Broz" \ org.opencontainers.image.vendor="IBM" \ @@ -83,6 +84,8 @@ RUN apt-get update \ && useradd -u 1001 -r -g 0 -s /usr/sbin/nologin default \ && LIBERTY_URL=${LIBERTY_URL:-$(wget -q -O - https://public.dhe.ibm.com/ibmdl/export/pub/software/websphere/wasdev/downloads/wlp/index.yml | grep -E "^\s*kernel:.*${LIBERTY_VERSION}\.zip" | sed -n 's/\s*kernel:\s//p' | tr -d '\r' )} \ && wget $DOWNLOAD_OPTIONS $LIBERTY_URL -U UA-IBM-WebSphere-Liberty-Docker -O /tmp/wlp.zip \ + && echo "$LIBERTY_SHA /tmp/wlp.zip" > /tmp/wlp.zip.sha1 \ + && sha1sum -c /tmp/wlp.zip.sha1 \ && unzip -q /tmp/wlp.zip -d /opt/ibm \ && rm /tmp/wlp.zip \ && chown -R 1001:0 /opt/ibm/wlp \ diff --git a/ga/24.0.0.2/kernel/Dockerfile.ubuntu.openjdk11 b/ga/24.0.0.2/kernel/Dockerfile.ubuntu.openjdk11 index 674d7898f..10890369b 100644 --- a/ga/24.0.0.2/kernel/Dockerfile.ubuntu.openjdk11 +++ b/ga/24.0.0.2/kernel/Dockerfile.ubuntu.openjdk11 @@ -21,6 +21,7 @@ ARG OPENJ9_SCC=true ARG LIBERTY_VERSION=24.0.0.2 ARG LIBERTY_BUILD_LABEL={replace_with_gm_driver_label} +ARG LIBERTY_SHA={replace_with_correct_sha} LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Thomas Watson, Wendy Raschke, Michal Broz" \ org.opencontainers.image.vendor="IBM" \ @@ -78,6 +79,8 @@ RUN apt-get update \ && useradd -u 1001 -r -g 0 -s /usr/sbin/nologin default \ && LIBERTY_URL=${LIBERTY_URL:-$(wget -q -O - https://public.dhe.ibm.com/ibmdl/export/pub/software/websphere/wasdev/downloads/wlp/index.yml | grep -E "^\s*kernel:.*${LIBERTY_VERSION}\.zip" | sed -n 's/\s*kernel:\s//p' | tr -d '\r' )} \ && wget $DOWNLOAD_OPTIONS $LIBERTY_URL -U UA-IBM-WebSphere-Liberty-Docker -O /tmp/wlp.zip \ + && echo "$LIBERTY_SHA /tmp/wlp.zip" > /tmp/wlp.zip.sha1 \ + && sha1sum -c /tmp/wlp.zip.sha1 \ && unzip -q /tmp/wlp.zip -d /opt/ibm \ && rm /tmp/wlp.zip \ && chown -R 1001:0 /opt/ibm/wlp \ diff --git a/ga/24.0.0.2/kernel/Dockerfile.ubuntu.openjdk17 b/ga/24.0.0.2/kernel/Dockerfile.ubuntu.openjdk17 index 10d42b099..c0bd32808 100644 --- a/ga/24.0.0.2/kernel/Dockerfile.ubuntu.openjdk17 +++ b/ga/24.0.0.2/kernel/Dockerfile.ubuntu.openjdk17 @@ -21,6 +21,7 @@ ARG OPENJ9_SCC=true ARG LIBERTY_VERSION=24.0.0.2 ARG LIBERTY_BUILD_LABEL={replace_with_gm_driver_label} +ARG LIBERTY_SHA={replace_with_correct_sha} LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Thomas Watson, Wendy Raschke, Michal Broz" \ org.opencontainers.image.vendor="IBM" \ @@ -78,6 +79,8 @@ RUN apt-get update \ && useradd -u 1001 -r -g 0 -s /usr/sbin/nologin default \ && LIBERTY_URL=${LIBERTY_URL:-$(wget -q -O - https://public.dhe.ibm.com/ibmdl/export/pub/software/websphere/wasdev/downloads/wlp/index.yml | grep -E "^\s*kernel:.*${LIBERTY_VERSION}\.zip" | sed -n 's/\s*kernel:\s//p' | tr -d '\r' )} \ && wget $DOWNLOAD_OPTIONS $LIBERTY_URL -U UA-IBM-WebSphere-Liberty-Docker -O /tmp/wlp.zip \ + && echo "$LIBERTY_SHA /tmp/wlp.zip" > /tmp/wlp.zip.sha1 \ + && sha1sum -c /tmp/wlp.zip.sha1 \ && unzip -q /tmp/wlp.zip -d /opt/ibm \ && rm /tmp/wlp.zip \ && chown -R 1001:0 /opt/ibm/wlp \