diff --git a/ci_build_images/debian.Dockerfile b/ci_build_images/debian.Dockerfile index fe9e5e5d..3e2e8f4e 100644 --- a/ci_build_images/debian.Dockerfile +++ b/ci_build_images/debian.Dockerfile @@ -23,6 +23,7 @@ RUN . /etc/os-release \ exit 1; \ fi +ARG BASE_IMAGE ARG ARCH_VARIANT= ENV ARCH_VARIANT=$ARCH_VARIANT # Install updates and required packages @@ -71,7 +72,11 @@ RUN . /etc/os-release \ libasio-dev \ # bootstrapping libboost additions in below line for MDEV-35826. \ # to be removed after https://github.com/MariaDB/server/pull/2651 merge to 11.4 \ - libboost-atomic-dev libboost-chrono-dev libboost-date-time-dev libboost-regex-dev libboost-system-dev libboost-thread-dev \ + libboost-atomic-dev \ + libboost-chrono-dev \ + libboost-date-time-dev \ + libboost-regex-dev \ + libboost-thread-dev \ libboost-dev \ libboost-filesystem-dev \ libboost-program-options-dev \ @@ -90,6 +95,7 @@ RUN . /etc/os-release \ socat \ sudo \ wget \ + && if [ "$BASE_IMAGE" != "debian:sid" ]; then apt-get -y install --no-install-recommends libboost-system-dev; fi \ && if [ "$(getconf LONG_BIT)" = 64 ]; then apt-get -y install --no-install-recommends galera-4; fi \ && if [ "${VERSION_ID}" != 11 ]; then \ # Bootstrap MDEV-32686 so only temporary until https://github.com/MariaDB/server/pull/3692 merged up \