Skip to content

Commit aea5bf1

Browse files
idlewisidlewis
committed
Don't fetch index.yml from DHE unless needed
1 parent 28c25ec commit aea5bf1

22 files changed

+155
-40
lines changed

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

+4-2
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,10 @@ RUN yum -y install unzip wget openssl \
3131
&& yum clean all \
3232
&& mkdir -p /licenses \
3333
&& useradd -u 1001 -r -g 0 -s /usr/sbin/nologin default \
34-
&& 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' )} \
35-
&& if [ ! -f /tmp/wlp.zip ]; then wget $DOWNLOAD_OPTIONS $LIBERTY_URL -U UA-IBM-WebSphere-Liberty-Docker -O /tmp/wlp.zip; fi \
34+
&& if [ ! -f /tmp/wlp.zip ]; then \
35+
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' )}; \
36+
wget $DOWNLOAD_OPTIONS $LIBERTY_URL -U UA-IBM-WebSphere-Liberty-Docker -O /tmp/wlp.zip; \
37+
fi \
3638
&& echo "$LIBERTY_SHA /tmp/wlp.zip" > /tmp/wlp.zip.sha1 \
3739
&& sha1sum -c /tmp/wlp.zip.sha1 \
3840
&& chmod -R g+x /usr/bin \

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

+4-2
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,10 @@ RUN yum -y install shadow-utils unzip wget findutils openssl \
3232
&& yum clean all \
3333
&& mkdir -p /licenses \
3434
&& useradd -u 1001 -r -g 0 -s /usr/sbin/nologin default \
35-
&& 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' )} \
36-
&& if [ ! -f /tmp/wlp.zip ]; then wget $DOWNLOAD_OPTIONS $LIBERTY_URL -U UA-IBM-WebSphere-Liberty-Docker -O /tmp/wlp.zip; fi \
35+
&& if [ ! -f /tmp/wlp.zip ]; then \
36+
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' )}; \
37+
wget $DOWNLOAD_OPTIONS $LIBERTY_URL -U UA-IBM-WebSphere-Liberty-Docker -O /tmp/wlp.zip; \
38+
fi \
3739
&& echo "$LIBERTY_SHA /tmp/wlp.zip" > /tmp/wlp.zip.sha1 \
3840
&& sha1sum -c /tmp/wlp.zip.sha1 \
3941
&& chmod -R g+x /usr/bin \

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

+4-2
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,10 @@ RUN yum -y install shadow-utils unzip wget findutils openssl \
3131
&& yum clean all \
3232
&& mkdir -p /licenses \
3333
&& useradd -u 1001 -r -g 0 -s /usr/sbin/nologin default \
34-
&& 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' )} \
35-
&& if [ ! -f /tmp/wlp.zip ]; then wget $DOWNLOAD_OPTIONS $LIBERTY_URL -U UA-IBM-WebSphere-Liberty-Docker -O /tmp/wlp.zip; fi \
34+
&& if [ ! -f /tmp/wlp.zip ]; then \
35+
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' )}; \
36+
wget $DOWNLOAD_OPTIONS $LIBERTY_URL -U UA-IBM-WebSphere-Liberty-Docker -O /tmp/wlp.zip; \
37+
fi \
3638
&& echo "$LIBERTY_SHA /tmp/wlp.zip" > /tmp/wlp.zip.sha1 \
3739
&& sha1sum -c /tmp/wlp.zip.sha1 \
3840
&& chmod -R g+x /usr/bin \

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

+4-2
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,10 @@ COPY resources/ /tmp/
3030
RUN microdnf -y install shadow-utils unzip wget findutils openssl \
3131
&& mkdir -p /licenses \
3232
&& useradd -u 1001 -r -g 0 -s /usr/sbin/nologin default \
33-
&& 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' )} \
34-
&& if [ ! -f /tmp/wlp.zip ]; then wget $DOWNLOAD_OPTIONS $LIBERTY_URL -U UA-IBM-WebSphere-Liberty-Docker -O /tmp/wlp.zip; fi \
33+
&& if [ ! -f /tmp/wlp.zip ]; then \
34+
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' )}; \
35+
wget $DOWNLOAD_OPTIONS $LIBERTY_URL -U UA-IBM-WebSphere-Liberty-Docker -O /tmp/wlp.zip; \
36+
fi \
3537
&& echo "$LIBERTY_SHA /tmp/wlp.zip" > /tmp/wlp.zip.sha1 \
3638
&& sha1sum -c /tmp/wlp.zip.sha1 \
3739
&& chmod -R g+x /usr/bin \

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

+4-2
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,10 @@ RUN yum -y install shadow-utils unzip wget findutils openssl \
3131
&& yum clean all \
3232
&& mkdir -p /licenses \
3333
&& useradd -u 1001 -r -g 0 -s /usr/sbin/nologin default \
34-
&& 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' )} \
35-
&& if [ ! -f /tmp/wlp.zip ]; then wget $DOWNLOAD_OPTIONS $LIBERTY_URL -U UA-IBM-WebSphere-Liberty-Docker -O /tmp/wlp.zip; fi \
34+
&& if [ ! -f /tmp/wlp.zip ]; then \
35+
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' )}; \
36+
wget $DOWNLOAD_OPTIONS $LIBERTY_URL -U UA-IBM-WebSphere-Liberty-Docker -O /tmp/wlp.zip; \
37+
fi \
3638
&& echo "$LIBERTY_SHA /tmp/wlp.zip" > /tmp/wlp.zip.sha1 \
3739
&& sha1sum -c /tmp/wlp.zip.sha1 \
3840
&& chmod -R g+x /usr/bin \

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

+4-2
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,10 @@ RUN yum -y install unzip wget openssl \
3131
&& yum clean all \
3232
&& mkdir -p /licenses \
3333
&& useradd -u 1001 -r -g 0 -s /usr/sbin/nologin default \
34-
&& 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' )} \
35-
&& if [ ! -f /tmp/wlp.zip ]; then wget $DOWNLOAD_OPTIONS $LIBERTY_URL -U UA-IBM-WebSphere-Liberty-Docker -O /tmp/wlp.zip; fi \
34+
&& if [ ! -f /tmp/wlp.zip ]; then \
35+
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' )}; \
36+
wget $DOWNLOAD_OPTIONS $LIBERTY_URL -U UA-IBM-WebSphere-Liberty-Docker -O /tmp/wlp.zip; \
37+
fi \
3638
&& echo "$LIBERTY_SHA /tmp/wlp.zip" > /tmp/wlp.zip.sha1 \
3739
&& sha1sum -c /tmp/wlp.zip.sha1 \
3840
&& chmod -R g+x /usr/bin \

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

+4-2
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,10 @@ RUN yum -y install shadow-utils unzip wget findutils openssl \
3232
&& yum clean all \
3333
&& mkdir -p /licenses \
3434
&& useradd -u 1001 -r -g 0 -s /usr/sbin/nologin default \
35-
&& 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' )} \
36-
&& if [ ! -f /tmp/wlp.zip ]; then wget $DOWNLOAD_OPTIONS $LIBERTY_URL -U UA-IBM-WebSphere-Liberty-Docker -O /tmp/wlp.zip; fi \
35+
&& if [ ! -f /tmp/wlp.zip ]; then \
36+
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' )}; \
37+
wget $DOWNLOAD_OPTIONS $LIBERTY_URL -U UA-IBM-WebSphere-Liberty-Docker -O /tmp/wlp.zip; \
38+
fi \
3739
&& echo "$LIBERTY_SHA /tmp/wlp.zip" > /tmp/wlp.zip.sha1 \
3840
&& sha1sum -c /tmp/wlp.zip.sha1 \
3941
&& chmod -R g+x /usr/bin \

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

+4-2
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,10 @@ RUN yum -y install shadow-utils unzip wget findutils openssl \
3131
&& yum clean all \
3232
&& mkdir -p /licenses \
3333
&& useradd -u 1001 -r -g 0 -s /usr/sbin/nologin default \
34-
&& 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' )} \
35-
&& if [ ! -f /tmp/wlp.zip ]; then wget $DOWNLOAD_OPTIONS $LIBERTY_URL -U UA-IBM-WebSphere-Liberty-Docker -O /tmp/wlp.zip; fi \
34+
&& if [ ! -f /tmp/wlp.zip ]; then \
35+
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' )}; \
36+
wget $DOWNLOAD_OPTIONS $LIBERTY_URL -U UA-IBM-WebSphere-Liberty-Docker -O /tmp/wlp.zip; \
37+
fi \
3638
&& echo "$LIBERTY_SHA /tmp/wlp.zip" > /tmp/wlp.zip.sha1 \
3739
&& sha1sum -c /tmp/wlp.zip.sha1 \
3840
&& chmod -R g+x /usr/bin \

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

+4-2
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,10 @@ COPY resources/ /tmp/
3030
RUN microdnf -y install shadow-utils unzip wget findutils openssl \
3131
&& mkdir -p /licenses \
3232
&& useradd -u 1001 -r -g 0 -s /usr/sbin/nologin default \
33-
&& 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' )} \
34-
&& if [ ! -f /tmp/wlp.zip ]; then wget $DOWNLOAD_OPTIONS $LIBERTY_URL -U UA-IBM-WebSphere-Liberty-Docker -O /tmp/wlp.zip; fi \
33+
&& if [ ! -f /tmp/wlp.zip ]; then \
34+
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' )}; \
35+
wget $DOWNLOAD_OPTIONS $LIBERTY_URL -U UA-IBM-WebSphere-Liberty-Docker -O /tmp/wlp.zip; \
36+
fi \
3537
&& echo "$LIBERTY_SHA /tmp/wlp.zip" > /tmp/wlp.zip.sha1 \
3638
&& sha1sum -c /tmp/wlp.zip.sha1 \
3739
&& chmod -R g+x /usr/bin \

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

+4-2
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,10 @@ RUN yum -y install shadow-utils unzip wget findutils openssl \
3131
&& yum clean all \
3232
&& mkdir -p /licenses \
3333
&& useradd -u 1001 -r -g 0 -s /usr/sbin/nologin default \
34-
&& 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' )} \
35-
&& if [ ! -f /tmp/wlp.zip ]; then wget $DOWNLOAD_OPTIONS $LIBERTY_URL -U UA-IBM-WebSphere-Liberty-Docker -O /tmp/wlp.zip; fi \
34+
&& if [ ! -f /tmp/wlp.zip ]; then \
35+
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' )}; \
36+
wget $DOWNLOAD_OPTIONS $LIBERTY_URL -U UA-IBM-WebSphere-Liberty-Docker -O /tmp/wlp.zip; \
37+
fi \
3638
&& echo "$LIBERTY_SHA /tmp/wlp.zip" > /tmp/wlp.zip.sha1 \
3739
&& sha1sum -c /tmp/wlp.zip.sha1 \
3840
&& chmod -R g+x /usr/bin \

‎ga/24.0.0.6/kernel/java/Dockerfile

+75
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,75 @@
1+
# (C) Copyright IBM Corporation 2016, 2019
2+
#
3+
# ------------------------------------------------------------------------------
4+
# NOTE: THIS DOCKERFILE IS GENERATED VIA "update.sh"
5+
#
6+
# PLEASE DO NOT EDIT IT DIRECTLY.
7+
# ------------------------------------------------------------------------------
8+
#
9+
# Licensed under the Apache License, Version 2.0 (the "License");
10+
# you may not use this file except in compliance with the License.
11+
# You may obtain a copy of the License at
12+
#
13+
# http://www.apache.org/licenses/LICENSE-2.0
14+
#
15+
# Unless required by applicable law or agreed to in writing, software
16+
# distributed under the License is distributed on an "AS IS" BASIS,
17+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
18+
# See the License for the specific language governing permissions and
19+
# limitations under the License.
20+
#
21+
22+
FROM registry.access.redhat.com/ubi8/ubi:latest
23+
24+
25+
RUN yum install -y wget openssl ca-certificates gzip tar \
26+
&& yum update; yum clean all
27+
28+
LABEL org.opencontainers.image.authors="Jayashree Gopi <[email protected]>" \
29+
name="IBM JAVA" \
30+
vendor="IBM" \
31+
version=8.0.8.30 \
32+
release=8 \
33+
run="docker run --rm -ti <image_name:tag> /bin/bash" \
34+
summary="Image for IBM JAVA with UBI as the base image" \
35+
description="This image contains the IBM JAVA with Red Hat UBI as the base OS. For more information on this image please see https://github.com/ibmruntimes/ci.docker/blob/master/README.md"
36+
37+
ENV JAVA_VERSION 8.0.8.30
38+
39+
RUN set -eux; \
40+
ARCH="$(uname -m)"; \
41+
case "${ARCH}" in \
42+
amd64|x86_64) \
43+
ESUM='918434b2288854235f141966710e2fe783d52a2956446dc0c6eb2902793bf068'; \
44+
YML_FILE='8.0/jre/linux/x86_64/index.yml'; \
45+
;; \
46+
ppc64el|ppc64le) \
47+
ESUM='f84a996f9ad2aee005a670ed57a698bfcf4aff58157ec8fe2540735a87df546d'; \
48+
YML_FILE='8.0/jre/linux/ppc64le/index.yml'; \
49+
;; \
50+
s390x) \
51+
ESUM='e8e00b99cae3277421b8277c843f481f31ee0e2857a67cc19b97460f9136dd9a'; \
52+
YML_FILE='8.0/jre/linux/s390x/index.yml'; \
53+
;; \
54+
*) \
55+
echo "Unsupported arch: ${ARCH}"; \
56+
exit 1; \
57+
;; \
58+
esac; \
59+
BASE_URL="https://public.dhe.ibm.com/ibmdl/export/pub/systems/cloud/runtimes/java/meta/"; \
60+
wget -q -U UA_IBM_JAVA_Docker -O /tmp/index.yml ${BASE_URL}/${YML_FILE}; \
61+
JAVA_URL=$(sed -n '/^'${JAVA_VERSION}:'/{n;s/\s*uri:\s//p}'< /tmp/index.yml); \
62+
wget -q -U UA_IBM_JAVA_Docker -O /tmp/ibm-java.tgz ${JAVA_URL}; \
63+
echo "${ESUM} /tmp/ibm-java.tgz" | sha256sum -c -; \
64+
mkdir -p /opt/ibm/java; \
65+
tar -xf /tmp/ibm-java.tgz -C /opt/ibm/java --strip-components=1; \
66+
rm -f /tmp/index.yml; \
67+
mkdir -p /licenses; \
68+
cp /opt/ibm/java/license_en.txt /licenses; \
69+
chown -R 1001:0 /opt/ibm/java; \
70+
rm -f /tmp/ibm-java.tgz;
71+
72+
ENV JAVA_HOME=/opt/ibm/java/jre \
73+
PATH=/opt/ibm/java/jre/bin:$PATH \
74+
IBM_JAVA_OPTIONS="-XX:+UseContainerSupport"
75+

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

+4-2
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,10 @@ RUN yum -y install unzip wget openssl \
3131
&& yum clean all \
3232
&& mkdir -p /licenses \
3333
&& useradd -u 1001 -r -g 0 -s /usr/sbin/nologin default \
34-
&& 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' )} \
35-
&& if [ ! -f /tmp/wlp.zip ]; then wget $DOWNLOAD_OPTIONS $LIBERTY_URL -U UA-IBM-WebSphere-Liberty-Docker -O /tmp/wlp.zip; fi \
34+
&& if [ ! -f /tmp/wlp.zip ]; then \
35+
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' )}; \
36+
wget $DOWNLOAD_OPTIONS $LIBERTY_URL -U UA-IBM-WebSphere-Liberty-Docker -O /tmp/wlp.zip; \
37+
fi \
3638
&& echo "$LIBERTY_SHA /tmp/wlp.zip" > /tmp/wlp.zip.sha1 \
3739
&& sha1sum -c /tmp/wlp.zip.sha1 \
3840
&& chmod -R g+x /usr/bin \

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

+4-2
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,10 @@ RUN yum -y install shadow-utils unzip wget findutils openssl \
3232
&& yum clean all \
3333
&& mkdir -p /licenses \
3434
&& useradd -u 1001 -r -g 0 -s /usr/sbin/nologin default \
35-
&& 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' )} \
36-
&& if [ ! -f /tmp/wlp.zip ]; then wget $DOWNLOAD_OPTIONS $LIBERTY_URL -U UA-IBM-WebSphere-Liberty-Docker -O /tmp/wlp.zip; fi \
35+
&& if [ ! -f /tmp/wlp.zip ]; then \
36+
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' )}; \
37+
wget $DOWNLOAD_OPTIONS $LIBERTY_URL -U UA-IBM-WebSphere-Liberty-Docker -O /tmp/wlp.zip; \
38+
fi \
3739
&& echo "$LIBERTY_SHA /tmp/wlp.zip" > /tmp/wlp.zip.sha1 \
3840
&& sha1sum -c /tmp/wlp.zip.sha1 \
3941
&& chmod -R g+x /usr/bin \

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

+4-2
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,10 @@ RUN yum -y install shadow-utils unzip wget findutils openssl \
3131
&& yum clean all \
3232
&& mkdir -p /licenses \
3333
&& useradd -u 1001 -r -g 0 -s /usr/sbin/nologin default \
34-
&& 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' )} \
35-
&& if [ ! -f /tmp/wlp.zip ]; then wget $DOWNLOAD_OPTIONS $LIBERTY_URL -U UA-IBM-WebSphere-Liberty-Docker -O /tmp/wlp.zip; fi \
34+
&& if [ ! -f /tmp/wlp.zip ]; then \
35+
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' )}; \
36+
wget $DOWNLOAD_OPTIONS $LIBERTY_URL -U UA-IBM-WebSphere-Liberty-Docker -O /tmp/wlp.zip; \
37+
fi \
3638
&& echo "$LIBERTY_SHA /tmp/wlp.zip" > /tmp/wlp.zip.sha1 \
3739
&& sha1sum -c /tmp/wlp.zip.sha1 \
3840
&& chmod -R g+x /usr/bin \

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

+4-2
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,10 @@ COPY resources/ /tmp/
3030
RUN microdnf -y install shadow-utils unzip wget findutils openssl \
3131
&& mkdir -p /licenses \
3232
&& useradd -u 1001 -r -g 0 -s /usr/sbin/nologin default \
33-
&& 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' )} \
34-
&& if [ ! -f /tmp/wlp.zip ]; then wget $DOWNLOAD_OPTIONS $LIBERTY_URL -U UA-IBM-WebSphere-Liberty-Docker -O /tmp/wlp.zip; fi \
33+
&& if [ ! -f /tmp/wlp.zip ]; then \
34+
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' )}; \
35+
wget $DOWNLOAD_OPTIONS $LIBERTY_URL -U UA-IBM-WebSphere-Liberty-Docker -O /tmp/wlp.zip; \
36+
fi \
3537
&& echo "$LIBERTY_SHA /tmp/wlp.zip" > /tmp/wlp.zip.sha1 \
3638
&& sha1sum -c /tmp/wlp.zip.sha1 \
3739
&& chmod -R g+x /usr/bin \

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

+4-2
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,10 @@ RUN yum -y install shadow-utils unzip wget findutils openssl \
3131
&& yum clean all \
3232
&& mkdir -p /licenses \
3333
&& useradd -u 1001 -r -g 0 -s /usr/sbin/nologin default \
34-
&& 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' )} \
35-
&& if [ ! -f /tmp/wlp.zip ]; then wget $DOWNLOAD_OPTIONS $LIBERTY_URL -U UA-IBM-WebSphere-Liberty-Docker -O /tmp/wlp.zip; fi \
34+
&& if [ ! -f /tmp/wlp.zip ]; then \
35+
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' )}; \
36+
wget $DOWNLOAD_OPTIONS $LIBERTY_URL -U UA-IBM-WebSphere-Liberty-Docker -O /tmp/wlp.zip; \
37+
fi \
3638
&& echo "$LIBERTY_SHA /tmp/wlp.zip" > /tmp/wlp.zip.sha1 \
3739
&& sha1sum -c /tmp/wlp.zip.sha1 \
3840
&& chmod -R g+x /usr/bin \

0 commit comments

Comments
 (0)