Skip to content

Commit 72345ba

Browse files
refactor(s390x): use bash arrays for PACKAGES in datascience Dockerfiles
Co-authored-by: Cursor <cursoragent@cursor.com>
1 parent 213feea commit 72345ba

2 files changed

Lines changed: 12 additions & 12 deletions

File tree

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -72,15 +72,15 @@ RUN --mount=type=cache,target=/var/cache/dnf /bin/bash <<'EOF'
7272
set -Eeuxo pipefail
7373
echo "Building for architecture: ${TARGETARCH}"
7474
if [ "$TARGETARCH" = "s390x" ]; then
75-
PACKAGES="perl mesa-libGL skopeo gcc gcc-c++ make openssl-devel autoconf automake libtool cmake python3-devel pybind11-devel openblas-devel unixODBC-devel"
75+
PACKAGES=(perl mesa-libGL skopeo gcc gcc-c++ make openssl-devel autoconf automake libtool cmake python3-devel pybind11-devel openblas-devel unixODBC-devel)
7676
subscription-manager refresh
7777
subscription-manager repos --enable=rhelai-3.0-for-rhel-9-s390x-rpms
78-
PACKAGES="$PACKAGES zeromq-devel"
78+
PACKAGES+=(zeromq-devel)
7979
else
80-
PACKAGES="perl mesa-libGL skopeo"
80+
PACKAGES=(perl mesa-libGL skopeo)
8181
fi
82-
echo "Installing: $PACKAGES"
83-
dnf install -y $PACKAGES
82+
echo "Installing: ${PACKAGES[*]}"
83+
dnf install -y "${PACKAGES[@]}"
8484
dnf clean all && rm -rf /var/cache/yum
8585
EOF
8686

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -44,21 +44,21 @@ EOF
4444
RUN --mount=type=cache,target=/var/cache/dnf /bin/bash <<'EOF'
4545
set -Eeuxo pipefail
4646
echo "Building for architecture: ${TARGETARCH}"
47-
PACKAGES="perl mesa-libGL skopeo libxcrypt-compat"
47+
PACKAGES=(perl mesa-libGL skopeo libxcrypt-compat)
4848
# Additional dev tools only for s390x
4949
if [ "$TARGETARCH" = "s390x" ]; then
50-
PACKAGES="$PACKAGES gcc gcc-c++ make openssl-devel autoconf automake libtool cmake python3-devel pybind11-devel openblas-devel unixODBC-devel openssl zlib-devel"
50+
PACKAGES+=(gcc gcc-c++ make openssl-devel autoconf automake libtool cmake python3-devel pybind11-devel openblas-devel unixODBC-devel openssl zlib-devel)
5151
# RH-signed zeromq-devel is in rhelai-3.0 (not UBI AppStream/EPEL). Export repos before dnf.
5252
subscription-manager refresh
5353
subscription-manager repos --enable=rhelai-3.0-for-rhel-9-s390x-rpms
54-
PACKAGES="$PACKAGES zeromq-devel"
54+
PACKAGES+=(zeromq-devel)
5555
fi
5656
if [ "$TARGETARCH" = "ppc64le" ]; then
57-
PACKAGES="$PACKAGES git gcc-toolset-13 make wget unzip rust cargo unixODBC-devel cmake ninja-build"
57+
PACKAGES+=(git gcc-toolset-13 make wget unzip rust cargo unixODBC-devel cmake ninja-build)
5858
fi
59-
if [ -n "$PACKAGES" ]; then
60-
echo "Installing: $PACKAGES"
61-
dnf install -y $PACKAGES
59+
if [ ${#PACKAGES[@]} -gt 0 ]; then
60+
echo "Installing: ${PACKAGES[*]}"
61+
dnf install -y "${PACKAGES[@]}"
6262
dnf clean all && rm -rf /var/cache/yum
6363
fi
6464
EOF

0 commit comments

Comments
 (0)