From 4224587118ffc8f8576664ebf755ecc37b899654 Mon Sep 17 00:00:00 2001 From: Mikhail Chernov Date: Fri, 5 Apr 2024 21:40:01 +0300 Subject: [PATCH] Use lite build for jre images. (#170) --- .../11/Dockerfile | 19 ++++- .../17/Dockerfile | 17 +++- .../21/Dockerfile | 17 +++- .../22/Dockerfile | 17 +++- .../liberica-openjre-alpine/11/Dockerfile | 22 +++-- .../liberica-openjre-alpine/17/Dockerfile | 23 ++++-- .../liberica-openjre-alpine/21/Dockerfile | 23 ++++-- .../liberica-openjre-alpine/22/Dockerfile | 19 +++-- .../liberica-openjre-centos/11/Dockerfile | 59 +++++++++----- .../liberica-openjre-centos/17/Dockerfile | 74 ++++++++++------- .../liberica-openjre-centos/21/Dockerfile | 73 ++++++++++------- .../liberica-openjre-centos/22/Dockerfile | 73 ++++++++++------- .../liberica-openjre-debian/11/Dockerfile | 80 +++++++++++-------- .../liberica-openjre-debian/17/Dockerfile | 71 +++++++++------- .../liberica-openjre-debian/21/Dockerfile | 73 ++++++++++------- .../liberica-openjre-debian/22/Dockerfile | 71 +++++++++------- 16 files changed, 454 insertions(+), 277 deletions(-) diff --git a/docker/repos/liberica-openjre-alpine-musl/11/Dockerfile b/docker/repos/liberica-openjre-alpine-musl/11/Dockerfile index c3d0c4a..ce87126 100644 --- a/docker/repos/liberica-openjre-alpine-musl/11/Dockerfile +++ b/docker/repos/liberica-openjre-alpine-musl/11/Dockerfile @@ -8,7 +8,9 @@ ARG LIBERICA_VERSION=11.0.22 ARG LIBERICA_BUILD=12 ARG LIBERICA_ROOT=/usr/lib/jvm/jdk-${LIBERICA_VERSION}-bellsoft ARG LIBERICA_VARIANT=jre -ARG LIBERICA_USE_LITE=0 +ARG LIBERICA_ROOT=/usr/lib/jvm/${LIBERICA_VARIANT}-${LIBERICA_VERSION}-bellsoft +ARG LIBERICA_RELEASE_TAG= +ARG LIBERICA_USE_LITE=1 ARG LIBSUFFIX="-musl" ARG LIBERICA_GENERATE_CDS=false @@ -29,12 +31,23 @@ RUN LIBERICA_ARCH='' && LIBERICA_ARCH_TAG='' && \ PACKED_ROOT="jre${LIBERICA_VERSION}" && \ LITE_VERSION_EXCLUDES="" && if [ "$LIBERICA_USE_LITE" = "1" ]; then \ LITE_VERSION_EXCLUDES="--exclude ${PACKED_ROOT}/man"; fi && \ + if [ "$LIBERICA_USE_LITE" = "1" ]; then \ + RSUFFIX="-lite"; \ + LITE_URL="/docker" ; \ + else \ + RSUFFIX=""; \ + LITE_URL=""; \ + fi && \ mkdir -p $LIBERICA_ROOT && \ mkdir -p /tmp/java && \ LIBERICA_BUILD_STR=${LIBERICA_BUILD:+"+${LIBERICA_BUILD}"} && \ PKG=`echo "bellsoft-${LIBERICA_VARIANT}${LIBERICA_VERSION}${LIBERICA_BUILD_STR}-linux-${LIBERICA_ARCH}${LIBSUFFIX}${RSUFFIX}.tar.gz"` && \ - wget "https://download.bell-sw.com/java/${LIBERICA_VERSION}${LIBERICA_BUILD_STR}/${PKG}" -O /tmp/java/jre.tar.gz && \ - SHA1=`wget -q "https://download.bell-sw.com/sha1sum/java/${LIBERICA_VERSION}${LIBERICA_BUILD_STR}" -O - | grep ${PKG} | grep -v json | cut -f1 -d' '` && \ + wget "https://download.bell-sw.com/java/${LIBERICA_VERSION}${LIBERICA_BUILD_STR}${LITE_URL}/${PKG}" -O /tmp/java/jre.tar.gz && \ + SHA_URL="https://download.bell-sw.com/sha1sum/java/${LIBERICA_VERSION}${LIBERICA_BUILD_STR}" \ + && if [ "$LIBERICA_USE_LITE" = "1" ]; then \ + SHA_URL="https://download.bell-sw.com/java/${LIBERICA_VERSION}${LIBERICA_BUILD_STR}/docker/sha1sum.txt"; \ + fi \ + && SHA1=$(wget -q ${SHA_URL} -O - | grep ${PKG} | grep -v json | cut -f1 -d' ') && \ echo "${SHA1} */tmp/java/jre.tar.gz" | sha1sum -c - && \ tar xzf /tmp/java/jre.tar.gz -C /tmp/java $LITE_VERSION_EXCLUDES && \ find "/tmp/java/${LIBERICA_VARIANT}-${LIBERICA_VERSION}" -maxdepth 1 -mindepth 1 -exec mv "{}" "${LIBERICA_ROOT}/" \; && \ diff --git a/docker/repos/liberica-openjre-alpine-musl/17/Dockerfile b/docker/repos/liberica-openjre-alpine-musl/17/Dockerfile index a0772ed..238338d 100644 --- a/docker/repos/liberica-openjre-alpine-musl/17/Dockerfile +++ b/docker/repos/liberica-openjre-alpine-musl/17/Dockerfile @@ -8,7 +8,7 @@ ARG LIBERICA_BUILD=13 ARG LIBERICA_VARIANT=jre ARG LIBERICA_ROOT=/usr/lib/jvm/${LIBERICA_VARIANT}-${LIBERICA_VERSION}-bellsoft ARG LIBERICA_RELEASE_TAG= -ARG LIBERICA_USE_LITE=0 +ARG LIBERICA_USE_LITE=1 ARG LIBSUFFIX="-musl" ARG LIBERICA_GENERATE_CDS=false @@ -32,14 +32,25 @@ RUN LIBERICA_ARCH='' && LIBERICA_ARCH_TAG='' && \ && LITE_VERSION_EXCLUDES="" \ && if [ "$LIBERICA_USE_LITE" = "1" ]; then \ LITE_VERSION_EXCLUDES="--exclude ${PACKED_ROOT}/man"; fi \ +&& if [ "$LIBERICA_USE_LITE" = "1" ]; then \ + RSUFFIX="-lite"; \ + LITE_URL="/docker" ; \ + else \ + RSUFFIX=""; \ + LITE_URL=""; \ + fi \ && mkdir -p $LIBERICA_ROOT \ && mkdir -p /tmp/java \ && LIBERICA_BUILD_STR=${LIBERICA_BUILD:+"+${LIBERICA_BUILD}"} \ && PKG=`echo "bellsoft-${LIBERICA_VARIANT}${LIBERICA_VERSION}${LIBERICA_BUILD_STR}-linux-${LIBERICA_ARCH}${LIBSUFFIX}${RSUFFIX}.tar.gz"` \ - && PKG_URL="https://download.bell-sw.com/java/${LIBERICA_VERSION}${LIBERICA_BUILD_STR}/${PKG}" \ + && PKG_URL="https://download.bell-sw.com/java/${LIBERICA_VERSION}${LIBERICA_BUILD_STR}${LITE_URL}/${PKG}" \ && echo "Download ${PKG_URL}" \ && wget "${PKG_URL}" -O /tmp/java/jre.tar.gz \ - && SHA1=$(wget -q "https://download.bell-sw.com/sha1sum/java/${LIBERICA_VERSION}${LIBERICA_BUILD_STR}" -O - | grep ${PKG} | grep -v json | cut -f1 -d' ') \ + && SHA_URL="https://download.bell-sw.com/sha1sum/java/${LIBERICA_VERSION}${LIBERICA_BUILD_STR}" \ + && if [ "$LIBERICA_USE_LITE" = "1" ]; then \ + SHA_URL="https://download.bell-sw.com/java/${LIBERICA_VERSION}${LIBERICA_BUILD_STR}/docker/sha1sum.txt"; \ + fi \ + && SHA1=$(wget -q ${SHA_URL} -O - | grep ${PKG} | grep -v json | cut -f1 -d' ') \ && echo "${SHA1} */tmp/java/jre.tar.gz" | sha1sum -c - \ && tar xzf /tmp/java/jre.tar.gz -C /tmp/java $LITE_VERSION_EXCLUDES \ && find "/tmp/java/${LIBERICA_VARIANT}-${LIBERICA_VERSION}" -maxdepth 1 -mindepth 1 -exec mv "{}" "${LIBERICA_ROOT}/" \; \ diff --git a/docker/repos/liberica-openjre-alpine-musl/21/Dockerfile b/docker/repos/liberica-openjre-alpine-musl/21/Dockerfile index ff24ade..1719fdb 100644 --- a/docker/repos/liberica-openjre-alpine-musl/21/Dockerfile +++ b/docker/repos/liberica-openjre-alpine-musl/21/Dockerfile @@ -8,7 +8,7 @@ ARG LIBERICA_BUILD=14 ARG LIBERICA_VARIANT=jre ARG LIBERICA_ROOT=/usr/lib/jvm/${LIBERICA_VARIANT}-${LIBERICA_VERSION}-bellsoft ARG LIBERICA_RELEASE_TAG= -ARG LIBERICA_USE_LITE=0 +ARG LIBERICA_USE_LITE=1 ARG LIBSUFFIX="-musl" ARG LIBERICA_GENERATE_CDS=false @@ -32,14 +32,25 @@ RUN LIBERICA_ARCH='' && LIBERICA_ARCH_TAG='' && \ && LITE_VERSION_EXCLUDES="" \ && if [ "$LIBERICA_USE_LITE" = "1" ]; then \ LITE_VERSION_EXCLUDES="--exclude ${PACKED_ROOT}/man"; fi \ + && if [ "$LIBERICA_USE_LITE" = "1" ]; then \ + RSUFFIX="-lite"; \ + LITE_URL="/docker" ; \ + else \ + RSUFFIX=""; \ + LITE_URL=""; \ + fi \ && mkdir -p $LIBERICA_ROOT \ && mkdir -p /tmp/java \ && LIBERICA_BUILD_STR=${LIBERICA_BUILD:+"+${LIBERICA_BUILD}"} \ && PKG=`echo "bellsoft-${LIBERICA_VARIANT}${LIBERICA_VERSION}${LIBERICA_BUILD_STR}-linux-${LIBERICA_ARCH}${LIBSUFFIX}${RSUFFIX}.tar.gz"` \ - && PKG_URL="https://download.bell-sw.com/java/${LIBERICA_VERSION}${LIBERICA_BUILD_STR}/${PKG}" \ + && PKG_URL="https://download.bell-sw.com/java/${LIBERICA_VERSION}${LIBERICA_BUILD_STR}${LITE_URL}/${PKG}" \ && echo "Download ${PKG_URL}" \ && wget "${PKG_URL}" -O /tmp/java/jre.tar.gz \ - && SHA1=$(wget -q "https://download.bell-sw.com/sha1sum/java/${LIBERICA_VERSION}${LIBERICA_BUILD_STR}" -O - | grep ${PKG} | grep -v json | cut -f1 -d' ') \ + && SHA_URL="https://download.bell-sw.com/sha1sum/java/${LIBERICA_VERSION}${LIBERICA_BUILD_STR}" \ + && if [ "$LIBERICA_USE_LITE" = "1" ]; then \ + SHA_URL="https://download.bell-sw.com/java/${LIBERICA_VERSION}${LIBERICA_BUILD_STR}/docker/sha1sum.txt"; \ + fi \ + && SHA1=$(wget -q ${SHA_URL} -O - | grep ${PKG} | grep -v json | cut -f1 -d' ') \ && echo "${SHA1} */tmp/java/jre.tar.gz" | sha1sum -c - \ && tar xzf /tmp/java/jre.tar.gz -C /tmp/java $LITE_VERSION_EXCLUDES \ && find "/tmp/java/${LIBERICA_VARIANT}-${LIBERICA_VERSION}" -maxdepth 1 -mindepth 1 -exec mv "{}" "${LIBERICA_ROOT}/" \; \ diff --git a/docker/repos/liberica-openjre-alpine-musl/22/Dockerfile b/docker/repos/liberica-openjre-alpine-musl/22/Dockerfile index 2948cf8..f3487d4 100644 --- a/docker/repos/liberica-openjre-alpine-musl/22/Dockerfile +++ b/docker/repos/liberica-openjre-alpine-musl/22/Dockerfile @@ -8,7 +8,7 @@ ARG LIBERICA_BUILD=37 ARG LIBERICA_VARIANT=jre ARG LIBERICA_ROOT=/usr/lib/jvm/${LIBERICA_VARIANT}-${LIBERICA_VERSION}-bellsoft ARG LIBERICA_RELEASE_TAG= -ARG LIBERICA_USE_LITE=0 +ARG LIBERICA_USE_LITE=1 ARG LIBSUFFIX="-musl" ARG LIBERICA_GENERATE_CDS=false @@ -32,14 +32,25 @@ RUN LIBERICA_ARCH='' && LIBERICA_ARCH_TAG='' && \ && LITE_VERSION_EXCLUDES="" \ && if [ "$LIBERICA_USE_LITE" = "1" ]; then \ LITE_VERSION_EXCLUDES="--exclude ${PACKED_ROOT}/man"; fi \ + && if [ "$LIBERICA_USE_LITE" = "1" ]; then \ + RSUFFIX="-lite"; \ + LITE_URL="/docker" ; \ + else \ + RSUFFIX=""; \ + LITE_URL=""; \ + fi \ && mkdir -p $LIBERICA_ROOT \ && mkdir -p /tmp/java \ && LIBERICA_BUILD_STR=${LIBERICA_BUILD:+"+${LIBERICA_BUILD}"} \ && PKG=`echo "bellsoft-${LIBERICA_VARIANT}${LIBERICA_VERSION}${LIBERICA_BUILD_STR}-linux-${LIBERICA_ARCH}${LIBSUFFIX}${RSUFFIX}.tar.gz"` \ - && PKG_URL="https://download.bell-sw.com/java/${LIBERICA_VERSION}${LIBERICA_BUILD_STR}/${PKG}" \ + && PKG_URL="https://download.bell-sw.com/java/${LIBERICA_VERSION}${LIBERICA_BUILD_STR}${LITE_URL}/${PKG}" \ && echo "Download ${PKG_URL}" \ && wget "${PKG_URL}" -O /tmp/java/jre.tar.gz \ - && SHA1=$(wget -q "https://download.bell-sw.com/sha1sum/java/${LIBERICA_VERSION}${LIBERICA_BUILD_STR}" -O - | grep ${PKG} | grep -v json | cut -f1 -d' ') \ + && SHA_URL="https://download.bell-sw.com/sha1sum/java/${LIBERICA_VERSION}${LIBERICA_BUILD_STR}" \ + && if [ "$LIBERICA_USE_LITE" = "1" ]; then \ + SHA_URL="https://download.bell-sw.com/java/${LIBERICA_VERSION}${LIBERICA_BUILD_STR}/docker/sha1sum.txt"; \ + fi \ + && SHA1=$(wget -q ${SHA_URL} -O - | grep ${PKG} | grep -v json | cut -f1 -d' ') \ && echo "${SHA1} */tmp/java/jre.tar.gz" | sha1sum -c - \ && tar xzf /tmp/java/jre.tar.gz -C /tmp/java $LITE_VERSION_EXCLUDES \ && find "/tmp/java/${LIBERICA_VARIANT}-${LIBERICA_VERSION}" -maxdepth 1 -mindepth 1 -exec mv "{}" "${LIBERICA_ROOT}/" \; \ diff --git a/docker/repos/liberica-openjre-alpine/11/Dockerfile b/docker/repos/liberica-openjre-alpine/11/Dockerfile index e8bc34f..5d37e89 100644 --- a/docker/repos/liberica-openjre-alpine/11/Dockerfile +++ b/docker/repos/liberica-openjre-alpine/11/Dockerfile @@ -56,7 +56,7 @@ ARG LIBERICA_VERSION=11.0.22 ARG LIBERICA_BUILD=12 ARG LIBERICA_ROOT=/usr/lib/jvm/jre-${LIBERICA_VERSION}-bellsoft ARG LIBERICA_VARIANT=jre -ARG LIBERICA_USE_LITE=0 +ARG LIBERICA_USE_LITE=1 ARG LIBERICA_GENERATE_CDS=false COPY --from=glibc-base /root/dest/ / @@ -94,14 +94,24 @@ RUN LIBERICA_ARCH='' && LIBERICA_ARCH_TAG='' && \ echo 'hosts: files mdns4_minimal [NOTFOUND=return] dns mdns4' > /etc/nsswitch.conf && \ mkdir -p $LIBERICA_ROOT && \ mkdir -p /tmp/java && \ - RSUFFIX="" && if [ "$LIBERICA_USE_LITE" = "1" ]; then RSUFFIX="-lite"; fi && \ + if [ "$LIBERICA_USE_LITE" = "1" ]; then \ + RSUFFIX="-lite"; \ + LITE_URL="/docker" ; \ + else \ + RSUFFIX=""; \ + LITE_URL=""; \ + fi && \ LIBERICA_BUILD_STR=${LIBERICA_BUILD:+"+${LIBERICA_BUILD}"} && \ - PKG=`echo "bellsoft-${LIBERICA_VARIANT}${LIBERICA_VERSION}${LIBERICA_BUILD_STR}-linux-${LIBERICA_ARCH}${RSUFFIX}.tar.gz"` && \ - wget "https://download.bell-sw.com/java/${LIBERICA_VERSION}${LIBERICA_BUILD_STR}/${PKG}" -O /tmp/java/jre.tar.gz && \ - SHA1=`wget -q "https://download.bell-sw.com/sha1sum/java/${LIBERICA_VERSION}${LIBERICA_BUILD_STR}" -O - | grep ${PKG} | grep -v json | cut -f1 -d' '` && \ + PKG=`echo "bellsoft-${LIBERICA_VARIANT}${LIBERICA_VERSION}${LIBERICA_BUILD_STR}-linux-${LIBERICA_ARCH}${LIBSUFFIX}${RSUFFIX}.tar.gz"` && \ + wget "https://download.bell-sw.com/java/${LIBERICA_VERSION}${LIBERICA_BUILD_STR}${LITE_URL}/${PKG}" -O /tmp/java/jre.tar.gz \ + && SHA_URL="https://download.bell-sw.com/sha1sum/java/${LIBERICA_VERSION}${LIBERICA_BUILD_STR}" \ + && if [ "$LIBERICA_USE_LITE" = "1" ]; then \ + SHA_URL="https://download.bell-sw.com/java/${LIBERICA_VERSION}${LIBERICA_BUILD_STR}/docker/sha1sum.txt"; \ + fi \ + && SHA1=$(wget -q ${SHA_URL} -O - | grep ${PKG} | grep -v json | cut -f1 -d' ') && \ echo "${SHA1} */tmp/java/jre.tar.gz" | sha1sum -c - && \ tar xzf /tmp/java/jre.tar.gz -C /tmp/java && \ - find "/tmp/java/${LIBERICA_VARIANT}-${LIBERICA_VERSION}${RSUFFIX}" -maxdepth 1 -mindepth 1 -exec mv "{}" "${LIBERICA_ROOT}/" \; && \ + find "/tmp/java/${LIBERICA_VARIANT}-${LIBERICA_VERSION}" -maxdepth 1 -mindepth 1 -exec mv "{}" "${LIBERICA_ROOT}/" \; && \ ln -s "${LIBERICA_ROOT}" /usr/lib/jvm/jre && \ (ls /usr/lib/jvm/jre/lib/client 1>/dev/null 2>&1 && (rm -rf /usr/lib/jvm/jre/lib/client && sed -i 's#-client\s\+KNOWN#-client IGNORE#g' /usr/lib/jvm/jre/lib/jvm.cfg) || : ) \ && if [ $LIBERICA_GENERATE_CDS = true ]; then \ diff --git a/docker/repos/liberica-openjre-alpine/17/Dockerfile b/docker/repos/liberica-openjre-alpine/17/Dockerfile index 9f977b2..a61a66a 100644 --- a/docker/repos/liberica-openjre-alpine/17/Dockerfile +++ b/docker/repos/liberica-openjre-alpine/17/Dockerfile @@ -57,7 +57,7 @@ ARG LIBERICA_BUILD=13 ARG LIBERICA_VARIANT=jre ARG LIBERICA_ROOT=/usr/lib/jvm/${LIBERICA_VARIANT}-${LIBERICA_VERSION}-bellsoft -ARG LIBERICA_USE_LITE=0 +ARG LIBERICA_USE_LITE=1 ARG LIBERICA_GENERATE_CDS=false COPY --from=glibc-base /root/dest/ / @@ -96,18 +96,27 @@ RUN LIBERICA_ARCH='' && LIBERICA_ARCH_TAG='' && \ && echo 'hosts: files mdns4_minimal [NOTFOUND=return] dns mdns4' > /etc/nsswitch.conf \ && mkdir -p $LIBERICA_ROOT \ && mkdir -p /tmp/java \ - && RSUFFIX="" \ - && if [ "$LIBERICA_USE_LITE" = "1" ]; then RSUFFIX="-lite"; fi \ + && if [ "$LIBERICA_USE_LITE" = "1" ]; then \ + RSUFFIX="-lite"; \ + LITE_URL="/docker" ; \ + else \ + RSUFFIX=""; \ + LITE_URL=""; \ + fi \ && LIBERICA_BUILD_STR=${LIBERICA_BUILD:+"+${LIBERICA_BUILD}"} \ && echo LIBERICA_BUILD_STR - ${LIBERICA_BUILD_STR} \ - && PKG="bellsoft-${LIBERICA_VARIANT}${LIBERICA_VERSION}${LIBERICA_BUILD_STR}-linux-${LIBERICA_ARCH}${RSUFFIX}.tar.gz" \ - && PKG_URL="https://download.bell-sw.com/java/${LIBERICA_VERSION}${LIBERICA_BUILD_STR}/${PKG}" \ + && PKG="bellsoft-${LIBERICA_VARIANT}${LIBERICA_VERSION}${LIBERICA_BUILD_STR}-linux-${LIBERICA_ARCH}${LIBSUFFIX}${RSUFFIX}.tar.gz" \ + && PKG_URL="https://download.bell-sw.com/java/${LIBERICA_VERSION}${LIBERICA_BUILD_STR}${LITE_URL}/${PKG}" \ && echo "Download ${PKG_URL}" \ && wget "${PKG_URL}" -O /tmp/java/jre.tar.gz \ - && SHA1=$(wget -q "https://download.bell-sw.com/sha1sum/java/${LIBERICA_VERSION}${LIBERICA_BUILD_STR}" -O - | grep ${PKG} | grep -v json | cut -f1 -d' ') \ + && SHA_URL="https://download.bell-sw.com/sha1sum/java/${LIBERICA_VERSION}${LIBERICA_BUILD_STR}" \ + && if [ "$LIBERICA_USE_LITE" = "1" ]; then \ + SHA_URL="https://download.bell-sw.com/java/${LIBERICA_VERSION}${LIBERICA_BUILD_STR}/docker/sha1sum.txt"; \ + fi \ + && SHA1=$(wget -q ${SHA_URL} -O - | grep ${PKG} | grep -v json | cut -f1 -d' ') \ && echo "${SHA1} */tmp/java/jre.tar.gz" | sha1sum -c - \ && tar xzf /tmp/java/jre.tar.gz -C /tmp/java \ - && find "/tmp/java/${LIBERICA_VARIANT}-${LIBERICA_VERSION}${RSUFFIX}" -maxdepth 1 -mindepth 1 -exec mv "{}" "${LIBERICA_ROOT}/" \; \ + && find "/tmp/java/${LIBERICA_VARIANT}-${LIBERICA_VERSION}" -maxdepth 1 -mindepth 1 -exec mv "{}" "${LIBERICA_ROOT}/" \; \ && ln -s $LIBERICA_ROOT /usr/lib/jvm/jre \ && (ls /usr/lib/jvm/jre/lib/client 1>/dev/null 2>&1 && (rm -rf /usr/lib/jvm/jre/lib/client && sed -i 's#-client\s\+KNOWN#-client IGNORE#g' /usr/lib/jvm/jre/lib/jvm.cfg) || : ) \ && if [ $LIBERICA_GENERATE_CDS = true ]; then \ diff --git a/docker/repos/liberica-openjre-alpine/21/Dockerfile b/docker/repos/liberica-openjre-alpine/21/Dockerfile index d052f51..7ff0c71 100644 --- a/docker/repos/liberica-openjre-alpine/21/Dockerfile +++ b/docker/repos/liberica-openjre-alpine/21/Dockerfile @@ -58,7 +58,7 @@ ARG LIBERICA_VARIANT=jre ARG LIBERICA_GENERATE_CDS=false ARG LIBERICA_ROOT=/usr/lib/jvm/${LIBERICA_VARIANT}-${LIBERICA_VERSION}-bellsoft -ARG LIBERICA_USE_LITE=0 +ARG LIBERICA_USE_LITE=1 ARG LIBERICA_GENERATE_CDS=false COPY --from=glibc-base /root/dest/ / @@ -97,18 +97,27 @@ RUN LIBERICA_ARCH='' && LIBERICA_ARCH_TAG='' && \ && echo 'hosts: files mdns4_minimal [NOTFOUND=return] dns mdns4' > /etc/nsswitch.conf \ && mkdir -p $LIBERICA_ROOT \ && mkdir -p /tmp/java \ - && RSUFFIX="" \ - && if [ "$LIBERICA_USE_LITE" = "1" ]; then RSUFFIX="-lite"; fi \ + && if [ "$LIBERICA_USE_LITE" = "1" ]; then \ + RSUFFIX="-lite"; \ + LITE_URL="/docker" ; \ + else \ + RSUFFIX=""; \ + LITE_URL=""; \ + fi \ && LIBERICA_BUILD_STR=${LIBERICA_BUILD:+"+${LIBERICA_BUILD}"} \ && echo LIBERICA_BUILD_STR - ${LIBERICA_BUILD_STR} \ - && PKG="bellsoft-${LIBERICA_VARIANT}${LIBERICA_VERSION}${LIBERICA_BUILD_STR}-linux-${LIBERICA_ARCH}${RSUFFIX}.tar.gz" \ - && PKG_URL="https://download.bell-sw.com/java/${LIBERICA_VERSION}${LIBERICA_BUILD_STR}/${PKG}" \ + && PKG="bellsoft-${LIBERICA_VARIANT}${LIBERICA_VERSION}${LIBERICA_BUILD_STR}-linux-${LIBERICA_ARCH}${LIBSUFFIX}${RSUFFIX}.tar.gz" \ + && PKG_URL="https://download.bell-sw.com/java/${LIBERICA_VERSION}${LIBERICA_BUILD_STR}${LITE_URL}/${PKG}" \ && echo "Download ${PKG_URL}" \ && wget "${PKG_URL}" -O /tmp/java/jre.tar.gz \ - && SHA1=$(wget -q "https://download.bell-sw.com/sha1sum/java/${LIBERICA_VERSION}${LIBERICA_BUILD_STR}" -O - | grep ${PKG} | grep -v json | cut -f1 -d' ') \ + && SHA_URL="https://download.bell-sw.com/sha1sum/java/${LIBERICA_VERSION}${LIBERICA_BUILD_STR}" \ + && if [ "$LIBERICA_USE_LITE" = "1" ]; then \ + SHA_URL="https://download.bell-sw.com/java/${LIBERICA_VERSION}${LIBERICA_BUILD_STR}/docker/sha1sum.txt"; \ + fi \ + && SHA1=$(wget -q ${SHA_URL} -O - | grep ${PKG} | grep -v json | cut -f1 -d' ') \ && echo "${SHA1} */tmp/java/jre.tar.gz" | sha1sum -c - \ && tar xzf /tmp/java/jre.tar.gz -C /tmp/java \ - && find "/tmp/java/${LIBERICA_VARIANT}-${LIBERICA_VERSION}${RSUFFIX}" -maxdepth 1 -mindepth 1 -exec mv "{}" "${LIBERICA_ROOT}/" \; \ + && find "/tmp/java/${LIBERICA_VARIANT}-${LIBERICA_VERSION}" -maxdepth 1 -mindepth 1 -exec mv "{}" "${LIBERICA_ROOT}/" \; \ && ln -s $LIBERICA_ROOT /usr/lib/jvm/jre \ && (ls /usr/lib/jvm/jre/lib/client 1>/dev/null 2>&1 && (rm -rf /usr/lib/jvm/jre/lib/client && sed -i 's#-client\s\+KNOWN#-client IGNORE#g' /usr/lib/jvm/jre/lib/jvm.cfg) || : ) \ && if [ $LIBERICA_GENERATE_CDS = true ]; then \ diff --git a/docker/repos/liberica-openjre-alpine/22/Dockerfile b/docker/repos/liberica-openjre-alpine/22/Dockerfile index dcb82c1..6ce94e9 100644 --- a/docker/repos/liberica-openjre-alpine/22/Dockerfile +++ b/docker/repos/liberica-openjre-alpine/22/Dockerfile @@ -97,15 +97,24 @@ RUN LIBERICA_ARCH='' && LIBERICA_ARCH_TAG='' && \ && echo 'hosts: files mdns4_minimal [NOTFOUND=return] dns mdns4' > /etc/nsswitch.conf \ && mkdir -p $LIBERICA_ROOT \ && mkdir -p /tmp/java \ - && RSUFFIX="" \ - && if [ "$LIBERICA_USE_LITE" = "1" ]; then RSUFFIX="-lite"; fi \ + && if [ "$LIBERICA_USE_LITE" = "1" ]; then \ + RSUFFIX="-lite"; \ + LITE_URL="/docker" ; \ + else \ + RSUFFIX=""; \ + LITE_URL=""; \ + fi \ && LIBERICA_BUILD_STR=${LIBERICA_BUILD:+"+${LIBERICA_BUILD}"} \ && echo LIBERICA_BUILD_STR - ${LIBERICA_BUILD_STR} \ - && PKG="bellsoft-${LIBERICA_VARIANT}${LIBERICA_VERSION}${LIBERICA_BUILD_STR}-linux-${LIBERICA_ARCH}${RSUFFIX}.tar.gz" \ - && PKG_URL="https://download.bell-sw.com/java/${LIBERICA_VERSION}${LIBERICA_BUILD_STR}/${PKG}" \ + && PKG="bellsoft-${LIBERICA_VARIANT}${LIBERICA_VERSION}${LIBERICA_BUILD_STR}-linux-${LIBERICA_ARCH}${LIBSUFFIX}${RSUFFIX}.tar.gz" \ + && PKG_URL="https://download.bell-sw.com/java/${LIBERICA_VERSION}${LIBERICA_BUILD_STR}${LITE_URL}/${PKG}" \ && echo "Download ${PKG_URL}" \ && wget "${PKG_URL}" -O /tmp/java/jre.tar.gz \ - && SHA1=$(wget -q "https://download.bell-sw.com/sha1sum/java/${LIBERICA_VERSION}${LIBERICA_BUILD_STR}" -O - | grep ${PKG} | grep -v json | cut -f1 -d' ') \ + && SHA_URL="https://download.bell-sw.com/sha1sum/java/${LIBERICA_VERSION}${LIBERICA_BUILD_STR}" \ + && if [ "$LIBERICA_USE_LITE" = "1" ]; then \ + SHA_URL="https://download.bell-sw.com/java/${LIBERICA_VERSION}${LIBERICA_BUILD_STR}/docker/sha1sum.txt"; \ + fi \ + && SHA1=$(wget -q ${SHA_URL} -O - | grep ${PKG} | grep -v json | cut -f1 -d' ') \ && echo "${SHA1} */tmp/java/jre.tar.gz" | sha1sum -c - \ && tar xzf /tmp/java/jre.tar.gz -C /tmp/java \ && find "/tmp/java/${LIBERICA_VARIANT}-${LIBERICA_VERSION}${RSUFFIX}" -maxdepth 1 -mindepth 1 -exec mv "{}" "${LIBERICA_ROOT}/" \; \ diff --git a/docker/repos/liberica-openjre-centos/11/Dockerfile b/docker/repos/liberica-openjre-centos/11/Dockerfile index 2a539f7..c0d6152 100644 --- a/docker/repos/liberica-openjre-centos/11/Dockerfile +++ b/docker/repos/liberica-openjre-centos/11/Dockerfile @@ -8,21 +8,23 @@ ARG LIBERICA_VERSION=11.0.22 ARG LIBERICA_BUILD=12 ARG LIBERICA_ROOT=/usr/lib/jvm/jre-${LIBERICA_VERSION}-bellsoft ARG LIBERICA_VARIANT=jre -ARG LIBERICA_USE_LITE=0 + +ARG LIBERICA_USE_LITE=1 ARG LIBERICA_GENERATE_CDS=false -RUN LIBERICA_ARCH='' && LIBERICA_ARCH_TAG='' && \ - case `uname -m` in \ - x86_64) \ - LIBERICA_ARCH="amd64" \ - ;; \ - i686) \ - LIBERICA_ARCH="i586" \ - ;; \ - aarch64) \ - LIBERICA_ARCH="aarch64" \ - ;; \ - armv[67]l) \ +RUN LIBERICA_ARCH='' \ + && LIBERICA_ARCH_TAG='' && \ + case `uname -m` in \ + x86_64) \ + LIBERICA_ARCH="amd64" \ + ;; \ + i686) \ + LIBERICA_ARCH="i586" \ + ;; \ + aarch64) \ + LIBERICA_ARCH="aarch64" \ + ;; \ + armv[67]l) \ LIBERICA_ARCH="arm32-vfp-hflt" \ ;; \ *) \ @@ -31,17 +33,29 @@ RUN LIBERICA_ARCH='' && LIBERICA_ARCH_TAG='' && \ esac && \ yum install -y fontconfig && \ mkdir -p $LIBERICA_ROOT && \ - mkdir -p /tmp/java && \ - RSUFFIX="" && if [ "$LIBERICA_USE_LITE" = "1" ]; then RSUFFIX="-lite"; fi && \ + mkdir -p /tmp/java \ + && RSUFFIX="" \ + && if [ "$LIBERICA_USE_LITE" = "1" ]; then \ + RSUFFIX="-lite"; \ + LITE_URL="/docker" ; \ + else \ + RSUFFIX=""; \ + LITE_URL=""; \ + fi && \ LIBERICA_BUILD_STR=${LIBERICA_BUILD:+"+${LIBERICA_BUILD}"} && \ PKG=`echo "bellsoft-${LIBERICA_VARIANT}${LIBERICA_VERSION}${LIBERICA_BUILD_STR}-linux-${LIBERICA_ARCH}${RSUFFIX}.tar.gz"` && \ - PKG_URL="https://download.bell-sw.com/java/${LIBERICA_VERSION}${LIBERICA_BUILD_STR}/${PKG}" && \ + PKG_URL="https://download.bell-sw.com/java/${LIBERICA_VERSION}${LIBERICA_BUILD_STR}${LITE_URL}/${PKG}" && \ echo "Download ${PKG_URL}" && \ - curl -SL "${PKG_URL}" -o /tmp/java/jre.tar.gz && \ - SHA1=`curl -fSL "https://download.bell-sw.com/sha1sum/java/${LIBERICA_VERSION}${LIBERICA_BUILD_STR}" | grep ${PKG} | grep -v json | cut -f1 -d' '` && \ - echo "${SHA1} */tmp/java/jre.tar.gz" | sha1sum -c - && \ + curl -SL "${PKG_URL}" -o /tmp/java/jre.tar.gz \ + && SHA_URL="https://download.bell-sw.com/sha1sum/java/${LIBERICA_VERSION}${LIBERICA_BUILD_STR}" \ + && if [ "$LIBERICA_USE_LITE" = "1" ]; then \ + SHA_URL="https://download.bell-sw.com/java/${LIBERICA_VERSION}${LIBERICA_BUILD_STR}/docker/sha1sum.txt"; \ + fi \ + && echo ${SHA_URL} \ + && SHA1=$(curl -fSL ${SHA_URL} | grep ${PKG} | grep -v json | cut -f1 -d' ') \ + && echo "${SHA1} */tmp/java/jre.tar.gz" | sha1sum -c - && \ tar xzf /tmp/java/jre.tar.gz -C /tmp/java && \ - find "/tmp/java/${LIBERICA_VARIANT}-${LIBERICA_VERSION}${RSUFFIX}" -maxdepth 1 -mindepth 1 -exec mv "{}" "${LIBERICA_ROOT}/" \; && \ + find "/tmp/java/${LIBERICA_VARIANT}-${LIBERICA_VERSION}" -maxdepth 1 -mindepth 1 -exec mv "{}" "${LIBERICA_ROOT}/" \; && \ ln -s "${LIBERICA_ROOT}" /usr/lib/jvm/jre && \ yum clean all && \ rm -rf /var/cache/yum && \ @@ -52,9 +66,10 @@ RUN LIBERICA_ARCH='' && LIBERICA_ARCH_TAG='' && \ ${LIBERICA_ROOT}/bin/java -Xshare:dump; \ else \ find ${LIBERICA_ROOT} -name "classes*.jsa" -exec rm {} \; ; \ - fi \ - && rm -rf /tmp/java \ + fi \ + && rm -rf /tmp/java \ && rm -rf /tmp/hsperfdata_root ENV JAVA_HOME=${LIBERICA_ROOT} \ PATH=${LIBERICA_ROOT}/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin + diff --git a/docker/repos/liberica-openjre-centos/17/Dockerfile b/docker/repos/liberica-openjre-centos/17/Dockerfile index c92bbd9..c39eafd 100644 --- a/docker/repos/liberica-openjre-centos/17/Dockerfile +++ b/docker/repos/liberica-openjre-centos/17/Dockerfile @@ -9,42 +9,53 @@ ARG LIBERICA_BUILD=13 ARG LIBERICA_VARIANT=jre ARG LIBERICA_ROOT=/usr/lib/jvm/${LIBERICA_VARIANT}-${LIBERICA_VERSION}-bellsoft -ARG LIBERICA_USE_LITE=0 +ARG LIBERICA_USE_LITE=1 ARG LIBERICA_GENERATE_CDS=false -RUN LIBERICA_ARCH='' \ - && LIBERICA_ARCH_TAG='' \ - && case `uname -m` in \ - x86_64) \ - LIBERICA_ARCH="amd64" \ - ;; \ - i686) \ - LIBERICA_ARCH="i586" \ - ;; \ - aarch64) \ - LIBERICA_ARCH="aarch64" \ - ;; \ - armv[67]l) \ +RUN LIBERICA_ARCH='' \ + && LIBERICA_ARCH_TAG='' && \ + case `uname -m` in \ + x86_64) \ + LIBERICA_ARCH="amd64" \ + ;; \ + i686) \ + LIBERICA_ARCH="i586" \ + ;; \ + aarch64) \ + LIBERICA_ARCH="aarch64" \ + ;; \ + armv[67]l) \ LIBERICA_ARCH="arm32-vfp-hflt" \ - ;; \ - *) \ - LIBERICA_ARCH=`uname -m` \ - ;; \ - esac \ - && yum install -y fontconfig \ - && mkdir -p $LIBERICA_ROOT \ - && mkdir -p /tmp/java \ - && RSUFFIX="" \ - && if [ "$LIBERICA_USE_LITE" = "1" ]; then RSUFFIX="-lite"; fi \ + ;; \ + *) \ + LIBERICA_ARCH=`uname -m` \ + ;; \ + esac \ + && yum install -y fontconfig \ + && mkdir -p $LIBERICA_ROOT \ + && mkdir -p /tmp/java \ + && RSUFFIX="" \ + && if [ "$LIBERICA_USE_LITE" = "1" ]; then \ + RSUFFIX="-lite"; \ + LITE_URL="/docker" ; \ + else \ + RSUFFIX=""; \ + LITE_URL=""; \ + fi \ && LIBERICA_BUILD_STR=${LIBERICA_BUILD:+"+${LIBERICA_BUILD}"} \ && PKG=`echo "bellsoft-${LIBERICA_VARIANT}${LIBERICA_VERSION}${LIBERICA_BUILD_STR}-linux-${LIBERICA_ARCH}${RSUFFIX}.tar.gz"` \ - && PKG_URL="https://download.bell-sw.com/java/${LIBERICA_VERSION}${LIBERICA_BUILD_STR}/${PKG}" \ + && PKG_URL="https://download.bell-sw.com/java/${LIBERICA_VERSION}${LIBERICA_BUILD_STR}${LITE_URL}/${PKG}" \ && echo "Download ${PKG_URL}" \ && curl -SL "${PKG_URL}" -o /tmp/java/jre.tar.gz \ - && SHA1=$(curl -fSL "https://download.bell-sw.com/sha1sum/java/${LIBERICA_VERSION}${LIBERICA_BUILD_STR}" | grep ${PKG} | grep -v json | cut -f1 -d' ') \ - && echo "${SHA1} */tmp/java/jre.tar.gz" | sha1sum -c - \ - && tar xzf /tmp/java/jre.tar.gz -C /tmp/java \ - && find "/tmp/java/${LIBERICA_VARIANT}-${LIBERICA_VERSION}${RSUFFIX}" -maxdepth 1 -mindepth 1 -exec mv "{}" "${LIBERICA_ROOT}/" \; \ + && SHA_URL="https://download.bell-sw.com/sha1sum/java/${LIBERICA_VERSION}${LIBERICA_BUILD_STR}" \ + && if [ "$LIBERICA_USE_LITE" = "1" ]; then \ + SHA_URL="https://download.bell-sw.com/java/${LIBERICA_VERSION}${LIBERICA_BUILD_STR}/docker/sha1sum.txt"; \ + fi \ + && echo ${SHA_URL} \ + && SHA1=$(curl -fSL ${SHA_URL} | grep ${PKG} | grep -v json | cut -f1 -d' ') \ + && echo "${SHA1} */tmp/java/jre.tar.gz" | sha1sum -c - \ + && tar xzf /tmp/java/jre.tar.gz -C /tmp/java \ + && find "/tmp/java/${LIBERICA_VARIANT}-${LIBERICA_VERSION}" -maxdepth 1 -mindepth 1 -exec mv "{}" "${LIBERICA_ROOT}/" \; \ && ln -s $LIBERICA_ROOT /usr/lib/jvm/jre \ && yum clean all \ && rm -rf /var/cache/yum \ @@ -56,9 +67,10 @@ RUN LIBERICA_ARCH='' \ ${LIBERICA_ROOT}/bin/java -XX:-UseCompressedOops -Xshare:dump; \ else \ find ${LIBERICA_ROOT} -name "classes*.jsa" -exec rm {} \; ; \ - fi \ - && rm -rf /tmp/java \ + fi \ + && rm -rf /tmp/java \ && rm -rf /tmp/hsperfdata_root ENV JAVA_HOME=${LIBERICA_ROOT} \ PATH=${LIBERICA_ROOT}/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin + diff --git a/docker/repos/liberica-openjre-centos/21/Dockerfile b/docker/repos/liberica-openjre-centos/21/Dockerfile index 787d20a..65ec118 100644 --- a/docker/repos/liberica-openjre-centos/21/Dockerfile +++ b/docker/repos/liberica-openjre-centos/21/Dockerfile @@ -9,42 +9,52 @@ ARG LIBERICA_BUILD=14 ARG LIBERICA_VARIANT=jre ARG LIBERICA_ROOT=/usr/lib/jvm/${LIBERICA_VARIANT}-${LIBERICA_VERSION}-bellsoft -ARG LIBERICA_USE_LITE=0 +ARG LIBERICA_USE_LITE=1 ARG LIBERICA_GENERATE_CDS=false -RUN LIBERICA_ARCH='' \ - && LIBERICA_ARCH_TAG='' \ - && case `uname -m` in \ - x86_64) \ - LIBERICA_ARCH="amd64" \ - ;; \ - i686) \ - LIBERICA_ARCH="i586" \ - ;; \ - aarch64) \ - LIBERICA_ARCH="aarch64" \ - ;; \ - armv[67]l) \ +RUN LIBERICA_ARCH='' \ + && LIBERICA_ARCH_TAG='' && \ + case `uname -m` in \ + x86_64) \ + LIBERICA_ARCH="amd64" \ + ;; \ + i686) \ + LIBERICA_ARCH="i586" \ + ;; \ + aarch64) \ + LIBERICA_ARCH="aarch64" \ + ;; \ + armv[67]l) \ LIBERICA_ARCH="arm32-vfp-hflt" \ - ;; \ - *) \ - LIBERICA_ARCH=`uname -m` \ - ;; \ - esac \ - && yum install -y fontconfig \ - && mkdir -p $LIBERICA_ROOT \ - && mkdir -p /tmp/java \ - && RSUFFIX="" \ - && if [ "$LIBERICA_USE_LITE" = "1" ]; then RSUFFIX="-lite"; fi \ + ;; \ + *) \ + LIBERICA_ARCH=`uname -m` \ + ;; \ + esac \ + && yum install -y fontconfig \ + && mkdir -p $LIBERICA_ROOT \ + && mkdir -p /tmp/java \ + && RSUFFIX="" \ + && if [ "$LIBERICA_USE_LITE" = "1" ]; then \ + RSUFFIX="-lite"; \ + LITE_URL="/docker" ; \ + else \ + RSUFFIX=""; \ + LITE_URL=""; \ + fi \ && LIBERICA_BUILD_STR=${LIBERICA_BUILD:+"+${LIBERICA_BUILD}"} \ && PKG=`echo "bellsoft-${LIBERICA_VARIANT}${LIBERICA_VERSION}${LIBERICA_BUILD_STR}-linux-${LIBERICA_ARCH}${RSUFFIX}.tar.gz"` \ - && PKG_URL="https://download.bell-sw.com/java/${LIBERICA_VERSION}${LIBERICA_BUILD_STR}/${PKG}" \ + && PKG_URL="https://download.bell-sw.com/java/${LIBERICA_VERSION}${LIBERICA_BUILD_STR}${LITE_URL}/${PKG}" \ && echo "Download ${PKG_URL}" \ && curl -SL "${PKG_URL}" -o /tmp/java/jre.tar.gz \ - && SHA1=$(curl -fSL "https://download.bell-sw.com/sha1sum/java/${LIBERICA_VERSION}${LIBERICA_BUILD_STR}" | grep ${PKG} | grep -v json | cut -f1 -d' ') \ - && echo "${SHA1} */tmp/java/jre.tar.gz" | sha1sum -c - \ - && tar xzf /tmp/java/jre.tar.gz -C /tmp/java \ - && find "/tmp/java/${LIBERICA_VARIANT}-${LIBERICA_VERSION}${RSUFFIX}" -maxdepth 1 -mindepth 1 -exec mv "{}" "${LIBERICA_ROOT}/" \; \ + && SHA_URL="https://download.bell-sw.com/sha1sum/java/${LIBERICA_VERSION}${LIBERICA_BUILD_STR}" \ + && if [ "$LIBERICA_USE_LITE" = "1" ]; then \ + SHA_URL="https://download.bell-sw.com/java/${LIBERICA_VERSION}${LIBERICA_BUILD_STR}/docker/sha1sum.txt"; \ + fi \ + && SHA1=$(curl -fSL ${SHA_URL} | grep ${PKG} | grep -v json | cut -f1 -d' ') \ + && echo "${SHA1} */tmp/java/jre.tar.gz" | sha1sum -c - \ + && tar xzf /tmp/java/jre.tar.gz -C /tmp/java \ + && find "/tmp/java/${LIBERICA_VARIANT}-${LIBERICA_VERSION}" -maxdepth 1 -mindepth 1 -exec mv "{}" "${LIBERICA_ROOT}/" \; \ && ln -s $LIBERICA_ROOT /usr/lib/jvm/jre \ && yum clean all \ && rm -rf /var/cache/yum \ @@ -56,9 +66,10 @@ RUN LIBERICA_ARCH='' \ ${LIBERICA_ROOT}/bin/java -XX:-UseCompressedOops -Xshare:dump; \ else \ find ${LIBERICA_ROOT} -name "classes*.jsa" -exec rm {} \; ; \ - fi \ - && rm -rf /tmp/java \ + fi \ + && rm -rf /tmp/java \ && rm -rf /tmp/hsperfdata_root ENV JAVA_HOME=${LIBERICA_ROOT} \ PATH=${LIBERICA_ROOT}/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin + diff --git a/docker/repos/liberica-openjre-centos/22/Dockerfile b/docker/repos/liberica-openjre-centos/22/Dockerfile index f80adb7..3034e0c 100644 --- a/docker/repos/liberica-openjre-centos/22/Dockerfile +++ b/docker/repos/liberica-openjre-centos/22/Dockerfile @@ -9,42 +9,52 @@ ARG LIBERICA_BUILD=37 ARG LIBERICA_VARIANT=jre ARG LIBERICA_ROOT=/usr/lib/jvm/${LIBERICA_VARIANT}-${LIBERICA_VERSION}-bellsoft -ARG LIBERICA_USE_LITE=0 +ARG LIBERICA_USE_LITE=1 ARG LIBERICA_GENERATE_CDS=false -RUN LIBERICA_ARCH='' \ - && LIBERICA_ARCH_TAG='' \ - && case `uname -m` in \ - x86_64) \ - LIBERICA_ARCH="amd64" \ - ;; \ - i686) \ - LIBERICA_ARCH="i586" \ - ;; \ - aarch64) \ - LIBERICA_ARCH="aarch64" \ - ;; \ - armv[67]l) \ +RUN LIBERICA_ARCH='' \ + && LIBERICA_ARCH_TAG='' && \ + case `uname -m` in \ + x86_64) \ + LIBERICA_ARCH="amd64" \ + ;; \ + i686) \ + LIBERICA_ARCH="i586" \ + ;; \ + aarch64) \ + LIBERICA_ARCH="aarch64" \ + ;; \ + armv[67]l) \ LIBERICA_ARCH="arm32-vfp-hflt" \ - ;; \ - *) \ - LIBERICA_ARCH=`uname -m` \ - ;; \ - esac \ - && yum install -y fontconfig \ - && mkdir -p $LIBERICA_ROOT \ - && mkdir -p /tmp/java \ - && RSUFFIX="" \ - && if [ "$LIBERICA_USE_LITE" = "1" ]; then RSUFFIX="-lite"; fi \ + ;; \ + *) \ + LIBERICA_ARCH=`uname -m` \ + ;; \ + esac \ + && yum install -y fontconfig \ + && mkdir -p $LIBERICA_ROOT \ + && mkdir -p /tmp/java \ + && RSUFFIX="" \ + && if [ "$LIBERICA_USE_LITE" = "1" ]; then \ + RSUFFIX="-lite"; \ + LITE_URL="/docker" ; \ + else \ + RSUFFIX=""; \ + LITE_URL=""; \ + fi \ && LIBERICA_BUILD_STR=${LIBERICA_BUILD:+"+${LIBERICA_BUILD}"} \ && PKG=`echo "bellsoft-${LIBERICA_VARIANT}${LIBERICA_VERSION}${LIBERICA_BUILD_STR}-linux-${LIBERICA_ARCH}${RSUFFIX}.tar.gz"` \ - && PKG_URL="https://download.bell-sw.com/java/${LIBERICA_VERSION}${LIBERICA_BUILD_STR}/${PKG}" \ + && PKG_URL="https://download.bell-sw.com/java/${LIBERICA_VERSION}${LIBERICA_BUILD_STR}${LITE_URL}/${PKG}" \ && echo "Download ${PKG_URL}" \ && curl -SL "${PKG_URL}" -o /tmp/java/jre.tar.gz \ - && SHA1=$(curl -fSL "https://download.bell-sw.com/sha1sum/java/${LIBERICA_VERSION}${LIBERICA_BUILD_STR}" | grep ${PKG} | grep -v json | cut -f1 -d' ') \ - && echo "${SHA1} */tmp/java/jre.tar.gz" | sha1sum -c - \ - && tar xzf /tmp/java/jre.tar.gz -C /tmp/java \ - && find "/tmp/java/${LIBERICA_VARIANT}-${LIBERICA_VERSION}${RSUFFIX}" -maxdepth 1 -mindepth 1 -exec mv "{}" "${LIBERICA_ROOT}/" \; \ + && SHA_URL="https://download.bell-sw.com/sha1sum/java/${LIBERICA_VERSION}${LIBERICA_BUILD_STR}" \ + && if [ "$LIBERICA_USE_LITE" = "1" ]; then \ + SHA_URL="https://download.bell-sw.com/java/${LIBERICA_VERSION}${LIBERICA_BUILD_STR}/docker/sha1sum.txt"; \ + fi \ + && SHA1=$(curl -fSL ${SHA_URL} | grep ${PKG} | grep -v json | cut -f1 -d' ') \ + && echo "${SHA1} */tmp/java/jre.tar.gz" | sha1sum -c - \ + && tar xzf /tmp/java/jre.tar.gz -C /tmp/java \ + && find "/tmp/java/${LIBERICA_VARIANT}-${LIBERICA_VERSION}" -maxdepth 1 -mindepth 1 -exec mv "{}" "${LIBERICA_ROOT}/" \; \ && ln -s $LIBERICA_ROOT /usr/lib/jvm/jre \ && yum clean all \ && rm -rf /var/cache/yum \ @@ -56,9 +66,10 @@ RUN LIBERICA_ARCH='' \ ${LIBERICA_ROOT}/bin/java -XX:-UseCompressedOops -Xshare:dump; \ else \ find ${LIBERICA_ROOT} -name "classes*.jsa" -exec rm {} \; ; \ - fi \ - && rm -rf /tmp/java \ + fi \ + && rm -rf /tmp/java \ && rm -rf /tmp/hsperfdata_root ENV JAVA_HOME=${LIBERICA_ROOT} \ PATH=${LIBERICA_ROOT}/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin + diff --git a/docker/repos/liberica-openjre-debian/11/Dockerfile b/docker/repos/liberica-openjre-debian/11/Dockerfile index c7449cb..d09033c 100644 --- a/docker/repos/liberica-openjre-debian/11/Dockerfile +++ b/docker/repos/liberica-openjre-debian/11/Dockerfile @@ -17,47 +17,59 @@ ARG LIBERICA_VERSION=11.0.22 ARG LIBERICA_BUILD=12 ARG LIBERICA_ROOT=/usr/lib/jvm/jre-${LIBERICA_VERSION}-bellsoft ARG LIBERICA_VARIANT=jre -ARG LIBERICA_USE_LITE=0 +ARG LIBERICA_USE_LITE=1 ARG LIBERICA_GENERATE_CDS=false -RUN LIBERICA_ARCH='' && LIBERICA_ARCH_TAG='' && \ - case `uname -m` in \ - x86_64) \ - LIBERICA_ARCH="amd64" \ - ;; \ - i686) \ - LIBERICA_ARCH="i586" \ - ;; \ - aarch64) \ - LIBERICA_ARCH="aarch64" \ - ;; \ - armv[67]l) \ +RUN LIBERICA_ARCH='' \ + && LIBERICA_ARCH_TAG='' && \ + case `uname -m` in \ + x86_64) \ + LIBERICA_ARCH="amd64" \ + ;; \ + i686) \ + LIBERICA_ARCH="i586" \ + ;; \ + aarch64) \ + LIBERICA_ARCH="aarch64" \ + ;; \ + armv[67]l) \ LIBERICA_ARCH="arm32-vfp-hflt" \ - ;; \ - *) \ - LIBERICA_ARCH=`uname -m` \ - ;; \ - esac && \ - mkdir -p $LIBERICA_ROOT && \ - mkdir -p /tmp/java && \ - RSUFFIX="" && if [ "$LIBERICA_USE_LITE" = "1" ]; then RSUFFIX="-lite"; fi && \ - LIBERICA_BUILD_STR=${LIBERICA_BUILD:+"+${LIBERICA_BUILD}"} && \ - PKG=`echo "bellsoft-${LIBERICA_VARIANT}${LIBERICA_VERSION}${LIBERICA_BUILD_STR}-linux-${LIBERICA_ARCH}${RSUFFIX}.tar.gz"` && \ - PKG_URL="https://download.bell-sw.com/java/${LIBERICA_VERSION}${LIBERICA_BUILD_STR}/${PKG}" && \ - echo "Download ${PKG_URL}" && \ - curl -SL "${PKG_URL}" -o /tmp/java/jre.tar.gz && \ - SHA1=`curl -fSL "https://download.bell-sw.com/sha1sum/java/${LIBERICA_VERSION}${LIBERICA_BUILD_STR}" | grep ${PKG} | grep -v json | cut -f1 -d' '` && \ - echo "${SHA1} */tmp/java/jre.tar.gz" | sha1sum -c - && \ - tar xzf /tmp/java/jre.tar.gz -C /tmp/java && \ - find "/tmp/java/${LIBERICA_VARIANT}-${LIBERICA_VERSION}${RSUFFIX}" -maxdepth 1 -mindepth 1 -exec mv "{}" "${LIBERICA_ROOT}/" \; && \ - ln -s "${LIBERICA_ROOT}" /usr/lib/jvm/jre && \ - (ls /usr/lib/jvm/jre/lib/client 1>/dev/null 2>&1 && (rm -rf /usr/lib/jvm/jre/lib/client && sed -i 's#-client\s\+KNOWN#-client IGNORE#g' /usr/lib/jvm/jre/lib/jvm.cfg) || : ) \ + ;; \ + *) \ + LIBERICA_ARCH=`uname -m` \ + ;; \ + esac \ + && mkdir -p $LIBERICA_ROOT \ + && mkdir -p /tmp/java \ + && RSUFFIX="" \ + && if [ "$LIBERICA_USE_LITE" = "1" ]; then \ + RSUFFIX="-lite"; \ + LITE_URL="/docker" ; \ + else \ + RSUFFIX=""; \ + LITE_URL=""; \ + fi \ + && LIBERICA_BUILD_STR=${LIBERICA_BUILD:+"+${LIBERICA_BUILD}"} \ + && PKG=`echo "bellsoft-${LIBERICA_VARIANT}${LIBERICA_VERSION}${LIBERICA_BUILD_STR}-linux-${LIBERICA_ARCH}${RSUFFIX}.tar.gz"` \ + && PKG_URL="https://download.bell-sw.com/java/${LIBERICA_VERSION}${LIBERICA_BUILD_STR}${LITE_URL}/${PKG}" \ +&& echo $PKG_URL \ + && curl -SL "${PKG_URL}" -o /tmp/java/jre.tar.gz \ + && SHA_URL="https://download.bell-sw.com/sha1sum/java/${LIBERICA_VERSION}${LIBERICA_BUILD_STR}" \ + && if [ "$LIBERICA_USE_LITE" = "1" ]; then \ + SHA_URL="https://download.bell-sw.com/java/${LIBERICA_VERSION}${LIBERICA_BUILD_STR}/docker/sha1sum.txt"; \ + fi \ + && SHA1=$(curl -fSL ${SHA_URL} | grep ${PKG} | grep -v json | cut -f1 -d' ') \ + && echo "${SHA1} */tmp/java/jre.tar.gz" | sha1sum -c - \ + && tar xzf /tmp/java/jre.tar.gz -C /tmp/java \ + && find "/tmp/java/${LIBERICA_VARIANT}-${LIBERICA_VERSION}" -maxdepth 1 -mindepth 1 -exec mv "{}" "${LIBERICA_ROOT}/" \; \ + && ln -s $LIBERICA_ROOT /usr/lib/jvm/jre \ + && (ls /usr/lib/jvm/jre/lib/client 1>/dev/null 2>&1 && (rm -rf /usr/lib/jvm/jre/lib/client && sed -i 's#-client\s\+KNOWN#-client IGNORE#g' /usr/lib/jvm/jre/lib/jvm.cfg) || : ) \ && if [ $LIBERICA_GENERATE_CDS = true ]; then \ ${LIBERICA_ROOT}/bin/java -Xshare:dump; \ else \ find ${LIBERICA_ROOT} -name "classes*.jsa" -exec rm {} \; ; \ - fi \ - && rm -rf /tmp/java \ + fi \ + && rm -rf /tmp/java \ && rm -rf /tmp/hsperfdata_root ENV JAVA_HOME=${LIBERICA_ROOT} \ diff --git a/docker/repos/liberica-openjre-debian/17/Dockerfile b/docker/repos/liberica-openjre-debian/17/Dockerfile index 9ae5e45..b63a215 100644 --- a/docker/repos/liberica-openjre-debian/17/Dockerfile +++ b/docker/repos/liberica-openjre-debian/17/Dockerfile @@ -17,40 +17,51 @@ ARG LIBERICA_BUILD=13 ARG LIBERICA_VARIANT=jre ARG LIBERICA_ROOT=/usr/lib/jvm/${LIBERICA_VARIANT}-${LIBERICA_VERSION}-bellsoft -ARG LIBERICA_USE_LITE=0 +ARG LIBERICA_USE_LITE=1 ARG LIBERICA_GENERATE_CDS=false -RUN LIBERICA_ARCH='' \ - && LIBERICA_ARCH_TAG='' && \ - case `uname -m` in \ - x86_64) \ - LIBERICA_ARCH="amd64" \ - ;; \ - i686) \ - LIBERICA_ARCH="i586" \ - ;; \ - aarch64) \ - LIBERICA_ARCH="aarch64" \ - ;; \ - armv[67]l) \ +RUN LIBERICA_ARCH='' \ + && LIBERICA_ARCH_TAG='' && \ + case `uname -m` in \ + x86_64) \ + LIBERICA_ARCH="amd64" \ + ;; \ + i686) \ + LIBERICA_ARCH="i586" \ + ;; \ + aarch64) \ + LIBERICA_ARCH="aarch64" \ + ;; \ + armv[67]l) \ LIBERICA_ARCH="arm32-vfp-hflt" \ - ;; \ - *) \ - LIBERICA_ARCH=`uname -m` \ - ;; \ - esac \ - && mkdir -p $LIBERICA_ROOT \ - && mkdir -p /tmp/java \ - && RSUFFIX="" \ - && if [ "$LIBERICA_USE_LITE" = "1" ]; then RSUFFIX="-lite"; fi \ + ;; \ + *) \ + LIBERICA_ARCH=`uname -m` \ + ;; \ + esac \ + && mkdir -p $LIBERICA_ROOT \ + && mkdir -p /tmp/java \ + && RSUFFIX="" \ + && if [ "$LIBERICA_USE_LITE" = "1" ]; then \ + RSUFFIX="-lite"; \ + LITE_URL="/docker" ; \ + else \ + RSUFFIX=""; \ + LITE_URL=""; \ + fi \ && LIBERICA_BUILD_STR=${LIBERICA_BUILD:+"+${LIBERICA_BUILD}"} \ && PKG=`echo "bellsoft-${LIBERICA_VARIANT}${LIBERICA_VERSION}${LIBERICA_BUILD_STR}-linux-${LIBERICA_ARCH}${RSUFFIX}.tar.gz"` \ - && PKG_URL="https://download.bell-sw.com/java/${LIBERICA_VERSION}${LIBERICA_BUILD_STR}/${PKG}" \ + && PKG_URL="https://download.bell-sw.com/java/${LIBERICA_VERSION}${LIBERICA_BUILD_STR}${LITE_URL}/${PKG}" \ +&& echo $PKG_URL \ && curl -SL "${PKG_URL}" -o /tmp/java/jre.tar.gz \ - && SHA1=$(curl -fSL "https://download.bell-sw.com/sha1sum/java/${LIBERICA_VERSION}${LIBERICA_BUILD_STR}" | grep ${PKG} | grep -v json | cut -f1 -d' ') \ - && echo "${SHA1} */tmp/java/jre.tar.gz" | sha1sum -c - \ - && tar xzf /tmp/java/jre.tar.gz -C /tmp/java \ - && find "/tmp/java/${LIBERICA_VARIANT}-${LIBERICA_VERSION}${RSUFFIX}" -maxdepth 1 -mindepth 1 -exec mv "{}" "${LIBERICA_ROOT}/" \; \ + && SHA_URL="https://download.bell-sw.com/sha1sum/java/${LIBERICA_VERSION}${LIBERICA_BUILD_STR}" \ + && if [ "$LIBERICA_USE_LITE" = "1" ]; then \ + SHA_URL="https://download.bell-sw.com/java/${LIBERICA_VERSION}${LIBERICA_BUILD_STR}/docker/sha1sum.txt"; \ + fi \ + && SHA1=$(curl -fSL ${SHA_URL} | grep ${PKG} | grep -v json | cut -f1 -d' ') \ + && echo "${SHA1} */tmp/java/jre.tar.gz" | sha1sum -c - \ + && tar xzf /tmp/java/jre.tar.gz -C /tmp/java \ + && find "/tmp/java/${LIBERICA_VARIANT}-${LIBERICA_VERSION}" -maxdepth 1 -mindepth 1 -exec mv "{}" "${LIBERICA_ROOT}/" \; \ && ln -s $LIBERICA_ROOT /usr/lib/jvm/jre \ && (ls /usr/lib/jvm/jre/lib/client 1>/dev/null 2>&1 && (rm -rf /usr/lib/jvm/jre/lib/client && sed -i 's#-client\s\+KNOWN#-client IGNORE#g' /usr/lib/jvm/jre/lib/jvm.cfg) || : ) \ && if [ $LIBERICA_GENERATE_CDS = true ]; then \ @@ -58,8 +69,8 @@ RUN LIBERICA_ARCH='' \ ${LIBERICA_ROOT}/bin/java -XX:-UseCompressedOops -Xshare:dump; \ else \ find ${LIBERICA_ROOT} -name "classes*.jsa" -exec rm {} \; ; \ - fi \ - && rm -rf /tmp/java \ + fi \ + && rm -rf /tmp/java \ && rm -rf /tmp/hsperfdata_root ENV JAVA_HOME=${LIBERICA_ROOT} \ diff --git a/docker/repos/liberica-openjre-debian/21/Dockerfile b/docker/repos/liberica-openjre-debian/21/Dockerfile index 7303c54..7529d60 100644 --- a/docker/repos/liberica-openjre-debian/21/Dockerfile +++ b/docker/repos/liberica-openjre-debian/21/Dockerfile @@ -17,40 +17,51 @@ ARG LIBERICA_BUILD=14 ARG LIBERICA_VARIANT=jre ARG LIBERICA_ROOT=/usr/lib/jvm/${LIBERICA_VARIANT}-${LIBERICA_VERSION}-bellsoft -ARG LIBERICA_USE_LITE=0 +ARG LIBERICA_USE_LITE=1 ARG LIBERICA_GENERATE_CDS=false -RUN LIBERICA_ARCH='' \ - && LIBERICA_ARCH_TAG='' && \ - case `uname -m` in \ - x86_64) \ - LIBERICA_ARCH="amd64" \ - ;; \ - i686) \ - LIBERICA_ARCH="i586" \ - ;; \ - aarch64) \ - LIBERICA_ARCH="aarch64" \ - ;; \ - armv[67]l) \ +RUN LIBERICA_ARCH='' \ + && LIBERICA_ARCH_TAG='' && \ + case `uname -m` in \ + x86_64) \ + LIBERICA_ARCH="amd64" \ + ;; \ + i686) \ + LIBERICA_ARCH="i586" \ + ;; \ + aarch64) \ + LIBERICA_ARCH="aarch64" \ + ;; \ + armv[67]l) \ LIBERICA_ARCH="arm32-vfp-hflt" \ - ;; \ - *) \ - LIBERICA_ARCH=`uname -m` \ - ;; \ - esac \ - && mkdir -p $LIBERICA_ROOT \ - && mkdir -p /tmp/java \ - && RSUFFIX="" \ - && if [ "$LIBERICA_USE_LITE" = "1" ]; then RSUFFIX="-lite"; fi \ + ;; \ + *) \ + LIBERICA_ARCH=`uname -m` \ + ;; \ + esac \ + && mkdir -p $LIBERICA_ROOT \ + && mkdir -p /tmp/java \ + && RSUFFIX="" \ + && if [ "$LIBERICA_USE_LITE" = "1" ]; then \ + RSUFFIX="-lite"; \ + LITE_URL="/docker" ; \ + else \ + RSUFFIX=""; \ + LITE_URL=""; \ + fi \ && LIBERICA_BUILD_STR=${LIBERICA_BUILD:+"+${LIBERICA_BUILD}"} \ - && PKG=`echo "bellsoft-${LIBERICA_VARIANT}${LIBERICA_VERSION}${LIBERICA_BUILD_STR}-linux-${LIBERICA_ARCH}${RSUFFIX}.tar.gz"` \ - && PKG_URL="https://download.bell-sw.com/java/${LIBERICA_VERSION}${LIBERICA_BUILD_STR}/${PKG}" \ + && PKG="bellsoft-${LIBERICA_VARIANT}${LIBERICA_VERSION}${LIBERICA_BUILD_STR}-linux-${LIBERICA_ARCH}${RSUFFIX}.tar.gz" \ + && PKG_URL="https://download.bell-sw.com/java/${LIBERICA_VERSION}${LIBERICA_BUILD_STR}${LITE_URL}/${PKG}" \ + && echo $PKG_URL \ && curl -SL "${PKG_URL}" -o /tmp/java/jre.tar.gz \ - && SHA1=$(curl -fSL "https://download.bell-sw.com/sha1sum/java/${LIBERICA_VERSION}${LIBERICA_BUILD_STR}" | grep ${PKG} | grep -v json | cut -f1 -d' ') \ - && echo "${SHA1} */tmp/java/jre.tar.gz" | sha1sum -c - \ - && tar xzf /tmp/java/jre.tar.gz -C /tmp/java \ - && find "/tmp/java/${LIBERICA_VARIANT}-${LIBERICA_VERSION}${RSUFFIX}" -maxdepth 1 -mindepth 1 -exec mv "{}" "${LIBERICA_ROOT}/" \; \ + && SHA_URL="https://download.bell-sw.com/sha1sum/java/${LIBERICA_VERSION}${LIBERICA_BUILD_STR}" \ + && if [ "$LIBERICA_USE_LITE" = "1" ]; then \ + SHA_URL="https://download.bell-sw.com/java/${LIBERICA_VERSION}${LIBERICA_BUILD_STR}/docker/sha1sum.txt"; \ + fi \ + && SHA1=$(curl -fSL ${SHA_URL} | grep ${PKG} | grep -v json | cut -f1 -d' ') \ + && echo "${SHA1} */tmp/java/jre.tar.gz" | sha1sum -c - \ + && tar xzf /tmp/java/jre.tar.gz -C /tmp/java \ + && find "/tmp/java/${LIBERICA_VARIANT}-${LIBERICA_VERSION}" -maxdepth 1 -mindepth 1 -exec mv "{}" "${LIBERICA_ROOT}/" \; \ && ln -s $LIBERICA_ROOT /usr/lib/jvm/jre \ && (ls /usr/lib/jvm/jre/lib/client 1>/dev/null 2>&1 && (rm -rf /usr/lib/jvm/jre/lib/client && sed -i 's#-client\s\+KNOWN#-client IGNORE#g' /usr/lib/jvm/jre/lib/jvm.cfg) || : ) \ && if [ $LIBERICA_GENERATE_CDS = true ]; then \ @@ -58,8 +69,8 @@ RUN LIBERICA_ARCH='' \ ${LIBERICA_ROOT}/bin/java -XX:-UseCompressedOops -Xshare:dump; \ else \ find ${LIBERICA_ROOT} -name "classes*.jsa" -exec rm {} \; ; \ - fi \ - && rm -rf /tmp/java \ + fi \ + && rm -rf /tmp/java \ && rm -rf /tmp/hsperfdata_root ENV JAVA_HOME=${LIBERICA_ROOT} \ diff --git a/docker/repos/liberica-openjre-debian/22/Dockerfile b/docker/repos/liberica-openjre-debian/22/Dockerfile index c73d943..a54f63c 100644 --- a/docker/repos/liberica-openjre-debian/22/Dockerfile +++ b/docker/repos/liberica-openjre-debian/22/Dockerfile @@ -17,40 +17,51 @@ ARG LIBERICA_BUILD=37 ARG LIBERICA_VARIANT=jre ARG LIBERICA_ROOT=/usr/lib/jvm/${LIBERICA_VARIANT}-${LIBERICA_VERSION}-bellsoft -ARG LIBERICA_USE_LITE=0 +ARG LIBERICA_USE_LITE=1 ARG LIBERICA_GENERATE_CDS=false -RUN LIBERICA_ARCH='' \ - && LIBERICA_ARCH_TAG='' && \ - case `uname -m` in \ - x86_64) \ - LIBERICA_ARCH="amd64" \ - ;; \ - i686) \ - LIBERICA_ARCH="i586" \ - ;; \ - aarch64) \ - LIBERICA_ARCH="aarch64" \ - ;; \ - armv[67]l) \ +RUN LIBERICA_ARCH='' \ + && LIBERICA_ARCH_TAG='' && \ + case `uname -m` in \ + x86_64) \ + LIBERICA_ARCH="amd64" \ + ;; \ + i686) \ + LIBERICA_ARCH="i586" \ + ;; \ + aarch64) \ + LIBERICA_ARCH="aarch64" \ + ;; \ + armv[67]l) \ LIBERICA_ARCH="arm32-vfp-hflt" \ - ;; \ - *) \ - LIBERICA_ARCH=`uname -m` \ - ;; \ - esac \ - && mkdir -p $LIBERICA_ROOT \ - && mkdir -p /tmp/java \ - && RSUFFIX="" \ - && if [ "$LIBERICA_USE_LITE" = "1" ]; then RSUFFIX="-lite"; fi \ + ;; \ + *) \ + LIBERICA_ARCH=`uname -m` \ + ;; \ + esac \ + && mkdir -p $LIBERICA_ROOT \ + && mkdir -p /tmp/java \ + && RSUFFIX="" \ + && if [ "$LIBERICA_USE_LITE" = "1" ]; then \ + RSUFFIX="-lite"; \ + LITE_URL="/docker" ; \ + else \ + RSUFFIX=""; \ + LITE_URL=""; \ + fi \ && LIBERICA_BUILD_STR=${LIBERICA_BUILD:+"+${LIBERICA_BUILD}"} \ && PKG=`echo "bellsoft-${LIBERICA_VARIANT}${LIBERICA_VERSION}${LIBERICA_BUILD_STR}-linux-${LIBERICA_ARCH}${RSUFFIX}.tar.gz"` \ - && PKG_URL="https://download.bell-sw.com/java/${LIBERICA_VERSION}${LIBERICA_BUILD_STR}/${PKG}" \ + && PKG_URL="https://download.bell-sw.com/java/${LIBERICA_VERSION}${LIBERICA_BUILD_STR}${LITE_URL}/${PKG}" \ + && echo $PKG_URL \ && curl -SL "${PKG_URL}" -o /tmp/java/jre.tar.gz \ - && SHA1=$(curl -fSL "https://download.bell-sw.com/sha1sum/java/${LIBERICA_VERSION}${LIBERICA_BUILD_STR}" | grep ${PKG} | grep -v json | cut -f1 -d' ') \ - && echo "${SHA1} */tmp/java/jre.tar.gz" | sha1sum -c - \ - && tar xzf /tmp/java/jre.tar.gz -C /tmp/java \ - && find "/tmp/java/${LIBERICA_VARIANT}-${LIBERICA_VERSION}${RSUFFIX}" -maxdepth 1 -mindepth 1 -exec mv "{}" "${LIBERICA_ROOT}/" \; \ + && SHA_URL="https://download.bell-sw.com/sha1sum/java/${LIBERICA_VERSION}${LIBERICA_BUILD_STR}" \ + && if [ "$LIBERICA_USE_LITE" = "1" ]; then \ + SHA_URL="https://download.bell-sw.com/java/${LIBERICA_VERSION}${LIBERICA_BUILD_STR}/docker/sha1sum.txt"; \ + fi \ + && SHA1=$(curl -fSL ${SHA_URL} | grep ${PKG} | grep -v json | cut -f1 -d' ') \ + && echo "${SHA1} */tmp/java/jre.tar.gz" | sha1sum -c - \ + && tar xzf /tmp/java/jre.tar.gz -C /tmp/java \ + && find "/tmp/java/${LIBERICA_VARIANT}-${LIBERICA_VERSION}" -maxdepth 1 -mindepth 1 -exec mv "{}" "${LIBERICA_ROOT}/" \; \ && ln -s $LIBERICA_ROOT /usr/lib/jvm/jre \ && (ls /usr/lib/jvm/jre/lib/client 1>/dev/null 2>&1 && (rm -rf /usr/lib/jvm/jre/lib/client && sed -i 's#-client\s\+KNOWN#-client IGNORE#g' /usr/lib/jvm/jre/lib/jvm.cfg) || : ) \ && if [ $LIBERICA_GENERATE_CDS = true ]; then \ @@ -58,8 +69,8 @@ RUN LIBERICA_ARCH='' \ ${LIBERICA_ROOT}/bin/java -XX:-UseCompressedOops -Xshare:dump; \ else \ find ${LIBERICA_ROOT} -name "classes*.jsa" -exec rm {} \; ; \ - fi \ - && rm -rf /tmp/java \ + fi \ + && rm -rf /tmp/java \ && rm -rf /tmp/hsperfdata_root ENV JAVA_HOME=${LIBERICA_ROOT} \