@@ -16,6 +16,8 @@ RUN zypper update -y \
1616 && VERSION_ID=${VERSION_ID%.*}0${VERSION_ID#*.} \
1717 && ARCH=$(rpm --query --queryformat='%{ARCH}' zypper) \
1818 && if [ "$ARCH" = x86_64 ]; then ARCH=amd64 ; fi \
19+ && if [ "$VERSION" = 16.0 ]; then JAVA=21; BOOST=1_86_0 ; PYTHON=313 ; \
20+ else JAVA=17; BOOST=1_75_0; PYTHON=311; fi \
1921 && zypper addrepo https://ci.mariadb.org/galera/mariadb-4.x-latest-gal-"${ARCH}-${ID%%-leap}-${VERSION_ID}" .repo \
2022 && zypper install -y \
2123 bzip2 \
@@ -37,14 +39,14 @@ RUN zypper update -y \
3739 judy-devel \
3840 krb5-devel \
3941 libaio-devel \
40- libboost_atomic1_75_0 -devel \
41- libboost_chrono1_75_0 -devel \
42- libboost_date_time1_75_0 -devel \
43- libboost_filesystem1_75_0 -devel \
44- libboost_program_options1_75_0 -devel \
45- libboost_regex1_75_0 -devel \
46- libboost_system1_75_0 -devel \
47- libboost_thread1_75_0 -devel \
42+ libboost_atomic "${BOOST}" -devel \
43+ libboost_chrono "${BOOST}" -devel \
44+ libboost_date_time "${BOOST}" -devel \
45+ libboost_filesystem "${BOOST}" -devel \
46+ libboost_program_options "${BOOST}" -devel \
47+ libboost_regex "${BOOST}" -devel \
48+ libboost_system "${BOOST}" -devel \
49+ libboost_thread "${BOOST}" -devel \
4850 libbz2-devel \
4951 libcurl-devel \
5052 libedit-devel \
@@ -56,13 +58,13 @@ RUN zypper update -y \
5658 libxml2-devel \
5759 libzstd-devel \
5860 lzo-devel \
59- java-11 -openjdk-devel \
61+ java-"${JAVA}" -openjdk-devel \
6062 pam-devel \
6163 pcre2-devel \
6264 perl-Net-SSLeay \
6365 policycoreutils \
64- python311 -devel \
65- python311 -pip \
66+ python "${PYTHON}" -devel \
67+ python "${PYTHON}" -pip \
6668 rpm-build \
6769 rpmlint \
6870 snappy-devel \
0 commit comments