Skip to content

Commit 300b79a

Browse files
committed
RHAIENG-2189: build(runtime/minimal): add missing -devel libraries
``` The headers or library files could not be found for zlib, a required dependency when compiling Pillow from source. Please see the install instructions at: https://pillow.readthedocs.io/en/latest/installation/basic-installation.html ```
1 parent b7f7f0c commit 300b79a

File tree

2 files changed

+40
-8
lines changed

2 files changed

+40
-8
lines changed

runtimes/datascience/ubi9-python-3.12/Dockerfile.cpu

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,17 +48,33 @@ EOF
4848
RUN --mount=type=cache,target=/var/cache/dnf,sharing=locked,id=notebooks-dnf /bin/bash <<'EOF'
4949
set -Eeuxo pipefail
5050
echo "Building for architecture: ${TARGETARCH}"
51-
PACKAGES="perl mesa-libGL skopeo libxcrypt-compat"
51+
PACKAGES=(perl mesa-libGL skopeo libxcrypt-compat)
52+
# Datascience packages devel dependencies
53+
if [ "$TARGETARCH" = "s390x" ] || [ "$TARGETARCH" = "ppc64le" ]; then
54+
PACKAGES+=(
55+
# required to compile pillow
56+
zlib-devel libjpeg-turbo-devel
57+
# optional pillow deps https://pillow.readthedocs.io/en/latest/installation/building-from-source.html#external-libraries
58+
#libtiff-devel libwebp-devel openjpeg2-devel lcms2-devel freetype-devel
59+
#libimagequant-devel harfbuzz-devel fribidi-devel
60+
61+
# required to compile maturin
62+
openssl-devel
63+
64+
# required to compile scikit-learn
65+
gcc-gfortran
66+
)
67+
fi
5268
# Additional dev tools only for s390x
5369
if [ "$TARGETARCH" = "s390x" ]; then
54-
PACKAGES="$PACKAGES gcc gcc-c++ make openssl-devel autoconf automake libtool cmake python3-devel pybind11-devel openblas-devel unixODBC-devel openssl zlib-devel"
70+
PACKAGES+=("gcc" "gcc-c++" "make" "openssl-devel" "autoconf" "automake" "libtool" "cmake" "python3-devel" "pybind11-devel" "openblas-devel" "unixODBC-devel" "openssl" "zlib-devel")
5571
fi
5672
if [ "$TARGETARCH" = "ppc64le" ]; then
57-
PACKAGES="$PACKAGES git gcc-toolset-13 make wget unzip rust cargo unixODBC-devel cmake ninja-build"
73+
PACKAGES+=(git gcc-toolset-13 make wget unzip rust cargo unixODBC-devel cmake ninja-build)
5874
fi
5975
if [ -n "$PACKAGES" ]; then
6076
echo "Installing: $PACKAGES"
61-
dnf install -y --setopt=keepcache=1 $PACKAGES
77+
dnf install -y --setopt=keepcache=1 "${PACKAGES[@]}"
6278
fi
6379
EOF
6480

runtimes/datascience/ubi9-python-3.12/Dockerfile.konflux.cpu

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -56,17 +56,33 @@ EOF
5656
RUN --mount=type=cache,target=/var/cache/dnf /bin/bash <<'EOF'
5757
set -Eeuxo pipefail
5858
echo "Building for architecture: ${TARGETARCH}"
59-
PACKAGES="perl mesa-libGL skopeo libxcrypt-compat"
59+
PACKAGES=(perl mesa-libGL skopeo libxcrypt-compat)
60+
# Datascience packages devel dependencies
61+
if [ "$TARGETARCH" = "s390x" ] || [ "$TARGETARCH" = "ppc64le" ]; then
62+
PACKAGES+=(
63+
# required to compile pillow
64+
zlib-devel libjpeg-turbo-devel
65+
# optional pillow deps https://pillow.readthedocs.io/en/latest/installation/building-from-source.html#external-libraries
66+
#libtiff-devel libwebp-devel openjpeg2-devel lcms2-devel freetype-devel
67+
#libimagequant-devel harfbuzz-devel fribidi-devel
68+
69+
# required to compile maturin
70+
openssl-devel
71+
72+
# required to compile scikit-learn
73+
gcc-gfortran
74+
)
75+
fi
6076
# Additional dev tools only for s390x
6177
if [ "$TARGETARCH" = "s390x" ]; then
62-
PACKAGES="$PACKAGES gcc gcc-c++ make openssl-devel autoconf automake libtool cmake python3-devel pybind11-devel openblas-devel unixODBC-devel openssl zlib-devel"
78+
PACKAGES+=("gcc" "gcc-c++" "make" "openssl-devel" "autoconf" "automake" "libtool" "cmake" "python3-devel" "pybind11-devel" "openblas-devel" "unixODBC-devel" "openssl" "zlib-devel")
6379
fi
6480
if [ "$TARGETARCH" = "ppc64le" ]; then
65-
PACKAGES="$PACKAGES git gcc-toolset-13 make wget unzip rust cargo unixODBC-devel cmake ninja-build"
81+
PACKAGES+=(git gcc-toolset-13 make wget unzip rust cargo unixODBC-devel cmake ninja-build)
6682
fi
6783
if [ -n "$PACKAGES" ]; then
6884
echo "Installing: $PACKAGES"
69-
dnf install -y $PACKAGES
85+
dnf install -y "${PACKAGES[@]}"
7086
dnf clean all
7187
rm -rf /var/cache/yum
7288
fi

0 commit comments

Comments
 (0)