diff --git a/config/hotspot.config b/config/hotspot.config index db8491d4c..140fa5ac0 100644 --- a/config/hotspot.config +++ b/config/hotspot.config @@ -52,19 +52,19 @@ OS_Family: linux Directory: 8/jdk/clefos Build: releases nightly -Type: full +Type: full slim Architectures: aarch64 armv7l x86_64 ppc64le OS_Family: linux Directory: 8/jdk/leap Build: releases nightly -Type: full +Type: full slim Architectures: aarch64 armv7l x86_64 ppc64le s390x OS_Family: linux Directory: 8/jdk/tumbleweed Build: releases nightly -Type: full +Type: full slim Architectures: aarch64 x86_64 ppc64le s390x OS_Family: linux Directory: 8/jdk/ubi-minimal @@ -268,19 +268,19 @@ OS_Family: linux Directory: 11/jdk/clefos Build: releases nightly -Type: full +Type: full slim Architectures: aarch64 armv7l x86_64 ppc64le OS_Family: linux Directory: 11/jdk/leap Build: releases nightly -Type: full +Type: full slim Architectures: aarch64 armv7l x86_64 ppc64le s390x OS_Family: linux Directory: 11/jdk/tumbleweed Build: releases nightly -Type: full +Type: full slim Architectures: aarch64 x86_64 ppc64le s390x OS_Family: linux Directory: 11/jdk/ubi-minimal @@ -474,7 +474,7 @@ OS_Family: linux Directory: 15/jdk/ubi Build: releases nightly -Type: full +Type: full slim Architectures: aarch64 x86_64 ppc64le s390x OS_Family: linux Directory: 15/jdk/ubi-minimal @@ -492,13 +492,13 @@ OS_Family: linux Directory: 15/jdk/clefos Build: releases nightly -Type: full +Type: full slim Architectures: aarch64 armv7l x86_64 ppc64le OS_Family: linux Directory: 15/jdk/leap Build: releases nightly -Type: full +Type: full slim Architectures: aarch64 armv7l x86_64 ppc64le s390x OS_Family: linux Directory: 15/jdk/tumbleweed @@ -692,7 +692,7 @@ OS_Family: linux Directory: 16/jdk/ubi Build: releases nightly -Type: full +Type: full slim Architectures: aarch64 x86_64 ppc64le s390x OS_Family: linux Directory: 16/jdk/ubi-minimal @@ -710,13 +710,13 @@ OS_Family: linux Directory: 16/jdk/clefos Build: releases nightly -Type: full +Type: full slim Architectures: aarch64 armv7l x86_64 ppc64le OS_Family: linux Directory: 16/jdk/leap Build: releases nightly -Type: full +Type: full slim Architectures: aarch64 armv7l x86_64 ppc64le s390x OS_Family: linux Directory: 16/jdk/tumbleweed diff --git a/config/openj9.config b/config/openj9.config index abe93f183..7dd483bf9 100644 --- a/config/openj9.config +++ b/config/openj9.config @@ -54,19 +54,19 @@ OS_Family: linux Directory: 8/jdk/clefos Build: releases nightly -Type: full +Type: full slim Architectures: x86_64 ppc64le OS_Family: linux Directory: 8/jdk/leap Build: releases nightly -Type: full +Type: full slim Architectures: x86_64 ppc64le s390x OS_Family: linux Directory: 8/jdk/tumbleweed Build: releases nightly -Type: full +Type: full slim Architectures: x86_64 ppc64le s390x OS_Family: linux Directory: 8/jdk/ubi-minimal @@ -270,19 +270,19 @@ OS_Family: linux Directory: 11/jdk/clefos Build: releases nightly -Type: full +Type: full slim Architectures: x86_64 ppc64le OS_Family: linux Directory: 11/jdk/leap Build: releases nightly -Type: full +Type: full slim Architectures: x86_64 ppc64le s390x OS_Family: linux Directory: 11/jdk/tumbleweed Build: releases nightly -Type: full +Type: full slim Architectures: x86_64 ppc64le s390x OS_Family: linux Directory: 11/jdk/ubi-minimal @@ -476,7 +476,7 @@ OS_Family: linux Directory: 15/jdk/ubi Build: releases nightly -Type: full +Type: full slim Architectures: x86_64 ppc64le s390x OS_Family: linux Directory: 15/jdk/ubi-minimal @@ -494,13 +494,13 @@ OS_Family: linux Directory: 15/jdk/clefos Build: releases nightly -Type: full +Type: full slim Architectures: x86_64 ppc64le OS_Family: linux Directory: 15/jdk/leap Build: releases nightly -Type: full +Type: full slim Architectures: x86_64 ppc64le s390x OS_Family: linux Directory: 15/jdk/tumbleweed @@ -694,7 +694,7 @@ OS_Family: linux Directory: 16/jdk/ubi Build: releases nightly -Type: full +Type: full slim Architectures: x86_64 ppc64le s390x OS_Family: linux Directory: 16/jdk/ubi-minimal @@ -712,13 +712,13 @@ OS_Family: linux Directory: 16/jdk/clefos Build: releases nightly -Type: full +Type: full slim Architectures: x86_64 ppc64le OS_Family: linux Directory: 16/jdk/leap Build: releases nightly -Type: full +Type: full slim Architectures: x86_64 ppc64le s390x OS_Family: linux Directory: 16/jdk/tumbleweed diff --git a/dockerfile_functions.sh b/dockerfile_functions.sh index b665835e3..146ff407a 100755 --- a/dockerfile_functions.sh +++ b/dockerfile_functions.sh @@ -476,6 +476,47 @@ print_alpine_slim_package() { EOI } +# Call the script to create the slim package for Ubi +print_ubi_slim_package() { + cat >> "$1" <<-EOI + export PATH="${jhome}/bin:\$PATH"; \\ + dnf install -y binutils; \\ + /usr/local/bin/slim-java.sh ${jhome}; \\ + dnf remove -y binutils; \\ + dnf clean all; \\ +EOI +} + +# Call the script to create the slim package for Ubi-minimal +print_ubi-minimal_slim_package() { + cat >> "$1" <<-EOI + export PATH="${jhome}/bin:\$PATH"; \\ + microdnf install -y binutils; \\ + /usr/local/bin/slim-java.sh ${jhome}; \\ + microdnf remove -y binutils; \\ + microdnf clean all; \\ +EOI +} + +# Call the script to create the slim package for leap & tumbleweed +print_leap_slim_package() { + cat >> "$1" <<-EOI + export PATH="${jhome}/bin:\$PATH"; \\ + zypper install --no-recommends -y binutils; \\ + /usr/local/bin/slim-java.sh ${jhome}; \\ + zypper remove -y binutils; \\ + zypper clean --all; \\ +EOI +} + +# Call the script to create the slim package for Centos & clefos +print_centos_slim_package() { + cat >> "$1" <<-EOI + export PATH="${jhome}/bin:\$PATH"; \\ + /usr/local/bin/slim-java.sh ${jhome}; \\ +EOI +} + # Print the main RUN command that installs Java on ubuntu. print_ubuntu_java_install() { local pkg=$2 @@ -651,6 +692,13 @@ RUN set -eux; \\ case "\${ARCH}" in \\ EOI print_java_install_pre "${file}" "${pkg}" "${bld}" "${btype}" "${osfamily}" "${os}" + if [ "${btype}" == "slim" ]; then + if [ "${os}" == "ubi" ]; then + print_ubi_slim_package "$1" + elif [ "${os}" == "ubi-minimal" ]; then + print_ubi-minimal_slim_package "$1" + fi + fi print_java_install_post "$1" } @@ -673,6 +721,9 @@ RUN set -eux; \\ case "\${ARCH}" in \\ EOI print_java_install_pre "${file}" "${pkg}" "${bld}" "${btype}" "${osfamily}" "${os}" + if [ "${btype}" == "slim" ]; then + print_centos_slim_package "$1" + fi print_java_install_post "$1" } @@ -692,6 +743,9 @@ RUN set -eux; \\ case "\${ARCH}" in \\ EOI print_java_install_pre "${file}" "${pkg}" "${bld}" "${btype}" "${osfamily}" "${os}" + if [ "${btype}" == "slim" ]; then + print_leap_slim_package "$1" + fi print_java_install_post "$1" }