Skip to content

Commit f81c2c1

Browse files
idlewisidlewis
authored
Add sha validation for wlp.zip (#585)
* Add sha validation for wlp.zip on latest * Add sha validation for wlp.zip on 24.0.0.2
1 parent 89f4197 commit f81c2c1

16 files changed

Lines changed: 50 additions & 0 deletions

‎ga/24.0.0.2/kernel/Dockerfile.ubi.ibmjava8‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ ARG VERBOSE=false
2222
ARG LIBERTY_VERSION=24.0.0.2
2323
ARG LIBERTY_URL
2424
ARG DOWNLOAD_OPTIONS=""
25+
ARG LIBERTY_SHA={replace_with_correct_sha}
2526

2627
# If there is a local copy of the image use that instead
2728
COPY resources/ /tmp/
@@ -32,6 +33,8 @@ RUN yum -y install unzip wget openssl \
3233
&& useradd -u 1001 -r -g 0 -s /usr/sbin/nologin default \
3334
&& 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' )} \
3435
&& if [ ! -f /tmp/wlp.zip ]; then wget $DOWNLOAD_OPTIONS $LIBERTY_URL -U UA-IBM-WebSphere-Liberty-Docker -O /tmp/wlp.zip; fi \
36+
&& echo "$LIBERTY_SHA /tmp/wlp.zip" > /tmp/wlp.zip.sha1 \
37+
&& sha1sum -c /tmp/wlp.zip.sha1 \
3538
&& chmod -R g+x /usr/bin \
3639
&& unzip -q /tmp/wlp.zip -d /opt/ibm \
3740
&& chown -R 1001:0 /opt/ibm/wlp \

‎ga/24.0.0.2/kernel/Dockerfile.ubi.openjdk11‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@ ARG VERBOSE=false
2222
ARG LIBERTY_VERSION=24.0.0.2
2323
ARG LIBERTY_URL
2424
ARG DOWNLOAD_OPTIONS=""
25+
ARG LIBERTY_SHA={replace_with_correct_sha}
26+
2527

2628
# If there is a local copy of the image use that instead
2729
COPY resources/ /tmp/
@@ -32,6 +34,8 @@ RUN yum -y install shadow-utils unzip wget findutils openssl \
3234
&& useradd -u 1001 -r -g 0 -s /usr/sbin/nologin default \
3335
&& 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' )} \
3436
&& if [ ! -f /tmp/wlp.zip ]; then wget $DOWNLOAD_OPTIONS $LIBERTY_URL -U UA-IBM-WebSphere-Liberty-Docker -O /tmp/wlp.zip; fi \
37+
&& echo "$LIBERTY_SHA /tmp/wlp.zip" > /tmp/wlp.zip.sha1 \
38+
&& sha1sum -c /tmp/wlp.zip.sha1 \
3539
&& chmod -R g+x /usr/bin \
3640
&& unzip -q /tmp/wlp.zip -d /opt/ibm \
3741
&& chown -R 1001:0 /opt/ibm/wlp \

‎ga/24.0.0.2/kernel/Dockerfile.ubi.openjdk17‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ ARG VERBOSE=false
2222
ARG LIBERTY_VERSION=24.0.0.2
2323
ARG LIBERTY_URL
2424
ARG DOWNLOAD_OPTIONS=""
25+
ARG LIBERTY_SHA={replace_with_correct_sha}
2526

2627
# If there is a local copy of the image use that instead
2728
COPY resources/ /tmp/
@@ -32,6 +33,8 @@ RUN yum -y install shadow-utils unzip wget findutils openssl \
3233
&& useradd -u 1001 -r -g 0 -s /usr/sbin/nologin default \
3334
&& 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' )} \
3435
&& if [ ! -f /tmp/wlp.zip ]; then wget $DOWNLOAD_OPTIONS $LIBERTY_URL -U UA-IBM-WebSphere-Liberty-Docker -O /tmp/wlp.zip; fi \
36+
&& echo "$LIBERTY_SHA /tmp/wlp.zip" > /tmp/wlp.zip.sha1 \
37+
&& sha1sum -c /tmp/wlp.zip.sha1 \
3538
&& chmod -R g+x /usr/bin \
3639
&& unzip -q /tmp/wlp.zip -d /opt/ibm \
3740
&& chown -R 1001:0 /opt/ibm/wlp \

‎ga/24.0.0.2/kernel/Dockerfile.ubi.openjdk21‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ ARG VERBOSE=false
2222
ARG LIBERTY_VERSION=24.0.0.2
2323
ARG LIBERTY_URL
2424
ARG DOWNLOAD_OPTIONS=""
25+
ARG LIBERTY_SHA={replace_with_correct_sha}
2526

2627
# If there is a local copy of the image use that instead
2728
COPY resources/ /tmp/
@@ -31,6 +32,8 @@ RUN microdnf -y install shadow-utils unzip wget findutils openssl \
3132
&& useradd -u 1001 -r -g 0 -s /usr/sbin/nologin default \
3233
&& 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' )} \
3334
&& if [ ! -f /tmp/wlp.zip ]; then wget $DOWNLOAD_OPTIONS $LIBERTY_URL -U UA-IBM-WebSphere-Liberty-Docker -O /tmp/wlp.zip; fi \
35+
&& echo "$LIBERTY_SHA /tmp/wlp.zip" > /tmp/wlp.zip.sha1 \
36+
&& sha1sum -c /tmp/wlp.zip.sha1 \
3437
&& chmod -R g+x /usr/bin \
3538
&& unzip -q /tmp/wlp.zip -d /opt/ibm \
3639
&& chown -R 1001:0 /opt/ibm/wlp \

‎ga/24.0.0.2/kernel/Dockerfile.ubi.openjdk8‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ ARG VERBOSE=false
2222
ARG LIBERTY_VERSION=24.0.0.2
2323
ARG LIBERTY_URL
2424
ARG DOWNLOAD_OPTIONS=""
25+
ARG LIBERTY_SHA={replace_with_correct_sha}
2526

2627
# If there is a local copy of the image use that instead
2728
COPY resources/ /tmp/
@@ -32,6 +33,8 @@ RUN yum -y install shadow-utils unzip wget findutils openssl \
3233
&& useradd -u 1001 -r -g 0 -s /usr/sbin/nologin default \
3334
&& 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' )} \
3435
&& if [ ! -f /tmp/wlp.zip ]; then wget $DOWNLOAD_OPTIONS $LIBERTY_URL -U UA-IBM-WebSphere-Liberty-Docker -O /tmp/wlp.zip; fi \
36+
&& echo "$LIBERTY_SHA /tmp/wlp.zip" > /tmp/wlp.zip.sha1 \
37+
&& sha1sum -c /tmp/wlp.zip.sha1 \
3538
&& chmod -R g+x /usr/bin \
3639
&& unzip -q /tmp/wlp.zip -d /opt/ibm \
3740
&& chown -R 1001:0 /opt/ibm/wlp \

‎ga/24.0.0.2/kernel/Dockerfile.ubuntu.ibmjava8‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ ARG OPENJ9_SCC=true
2121

2222
ARG LIBERTY_VERSION=24.0.0.2
2323
ARG LIBERTY_BUILD_LABEL={replace_with_gm_driver_label}
24+
ARG LIBERTY_SHA={replace_with_correct_sha}
2425

2526
LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Thomas Watson, Wendy Raschke, Michal Broz" \
2627
org.opencontainers.image.vendor="IBM" \
@@ -83,6 +84,8 @@ RUN apt-get update \
8384
&& useradd -u 1001 -r -g 0 -s /usr/sbin/nologin default \
8485
&& 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' )} \
8586
&& wget $DOWNLOAD_OPTIONS $LIBERTY_URL -U UA-IBM-WebSphere-Liberty-Docker -O /tmp/wlp.zip \
87+
&& echo "$LIBERTY_SHA /tmp/wlp.zip" > /tmp/wlp.zip.sha1 \
88+
&& sha1sum -c /tmp/wlp.zip.sha1 \
8689
&& unzip -q /tmp/wlp.zip -d /opt/ibm \
8790
&& rm /tmp/wlp.zip \
8891
&& chown -R 1001:0 /opt/ibm/wlp \

‎ga/24.0.0.2/kernel/Dockerfile.ubuntu.openjdk11‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ ARG OPENJ9_SCC=true
2121

2222
ARG LIBERTY_VERSION=24.0.0.2
2323
ARG LIBERTY_BUILD_LABEL={replace_with_gm_driver_label}
24+
ARG LIBERTY_SHA={replace_with_correct_sha}
2425

2526
LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Thomas Watson, Wendy Raschke, Michal Broz" \
2627
org.opencontainers.image.vendor="IBM" \
@@ -78,6 +79,8 @@ RUN apt-get update \
7879
&& useradd -u 1001 -r -g 0 -s /usr/sbin/nologin default \
7980
&& 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' )} \
8081
&& wget $DOWNLOAD_OPTIONS $LIBERTY_URL -U UA-IBM-WebSphere-Liberty-Docker -O /tmp/wlp.zip \
82+
&& echo "$LIBERTY_SHA /tmp/wlp.zip" > /tmp/wlp.zip.sha1 \
83+
&& sha1sum -c /tmp/wlp.zip.sha1 \
8184
&& unzip -q /tmp/wlp.zip -d /opt/ibm \
8285
&& rm /tmp/wlp.zip \
8386
&& chown -R 1001:0 /opt/ibm/wlp \

‎ga/24.0.0.2/kernel/Dockerfile.ubuntu.openjdk17‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ ARG OPENJ9_SCC=true
2121

2222
ARG LIBERTY_VERSION=24.0.0.2
2323
ARG LIBERTY_BUILD_LABEL={replace_with_gm_driver_label}
24+
ARG LIBERTY_SHA={replace_with_correct_sha}
2425

2526
LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Thomas Watson, Wendy Raschke, Michal Broz" \
2627
org.opencontainers.image.vendor="IBM" \
@@ -78,6 +79,8 @@ RUN apt-get update \
7879
&& useradd -u 1001 -r -g 0 -s /usr/sbin/nologin default \
7980
&& 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' )} \
8081
&& wget $DOWNLOAD_OPTIONS $LIBERTY_URL -U UA-IBM-WebSphere-Liberty-Docker -O /tmp/wlp.zip \
82+
&& echo "$LIBERTY_SHA /tmp/wlp.zip" > /tmp/wlp.zip.sha1 \
83+
&& sha1sum -c /tmp/wlp.zip.sha1 \
8184
&& unzip -q /tmp/wlp.zip -d /opt/ibm \
8285
&& rm /tmp/wlp.zip \
8386
&& chown -R 1001:0 /opt/ibm/wlp \

‎ga/latest/kernel/Dockerfile.ubi.ibmjava8‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ ARG VERBOSE=false
2222
ARG LIBERTY_VERSION=24.0.0.2
2323
ARG LIBERTY_URL
2424
ARG DOWNLOAD_OPTIONS=""
25+
ARG LIBERTY_SHA={replace_with_correct_sha}
2526

2627
# If there is a local copy of the image use that instead
2728
COPY resources/ /tmp/
@@ -32,6 +33,8 @@ RUN yum -y install unzip wget openssl \
3233
&& useradd -u 1001 -r -g 0 -s /usr/sbin/nologin default \
3334
&& 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' )} \
3435
&& if [ ! -f /tmp/wlp.zip ]; then wget $DOWNLOAD_OPTIONS $LIBERTY_URL -U UA-IBM-WebSphere-Liberty-Docker -O /tmp/wlp.zip; fi \
36+
&& echo "$LIBERTY_SHA /tmp/wlp.zip" > /tmp/wlp.zip.sha1 \
37+
&& sha1sum -c /tmp/wlp.zip.sha1 \
3538
&& chmod -R g+x /usr/bin \
3639
&& unzip -q /tmp/wlp.zip -d /opt/ibm \
3740
&& chown -R 1001:0 /opt/ibm/wlp \

‎ga/latest/kernel/Dockerfile.ubi.openjdk11‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@ ARG VERBOSE=false
2222
ARG LIBERTY_VERSION=24.0.0.2
2323
ARG LIBERTY_URL
2424
ARG DOWNLOAD_OPTIONS=""
25+
ARG LIBERTY_SHA={replace_with_correct_sha}
26+
2527

2628
# If there is a local copy of the image use that instead
2729
COPY resources/ /tmp/
@@ -32,6 +34,8 @@ RUN yum -y install shadow-utils unzip wget findutils openssl \
3234
&& useradd -u 1001 -r -g 0 -s /usr/sbin/nologin default \
3335
&& 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' )} \
3436
&& if [ ! -f /tmp/wlp.zip ]; then wget $DOWNLOAD_OPTIONS $LIBERTY_URL -U UA-IBM-WebSphere-Liberty-Docker -O /tmp/wlp.zip; fi \
37+
&& echo "$LIBERTY_SHA /tmp/wlp.zip" > /tmp/wlp.zip.sha1 \
38+
&& sha1sum -c /tmp/wlp.zip.sha1 \
3539
&& chmod -R g+x /usr/bin \
3640
&& unzip -q /tmp/wlp.zip -d /opt/ibm \
3741
&& chown -R 1001:0 /opt/ibm/wlp \

0 commit comments

Comments
 (0)