Skip to content

Commit e0167bd

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

20 files changed

+80
-40
lines changed

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

Lines changed: 4 additions & 2 deletions
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‎

Lines changed: 4 additions & 2 deletions
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‎

Lines changed: 4 additions & 2 deletions
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‎

Lines changed: 4 additions & 2 deletions
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‎

Lines changed: 4 additions & 2 deletions
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‎

Lines changed: 4 additions & 2 deletions
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‎

Lines changed: 4 additions & 2 deletions
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‎

Lines changed: 4 additions & 2 deletions
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‎

Lines changed: 4 additions & 2 deletions
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‎

Lines changed: 4 additions & 2 deletions
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)