diff --git a/ci_build_images/debian.Dockerfile b/ci_build_images/debian.Dockerfile index 2a7e7baa2..4ba66ca6e 100644 --- a/ci_build_images/debian.Dockerfile +++ b/ci_build_images/debian.Dockerfile @@ -28,10 +28,10 @@ RUN . /etc/os-release; \ && apt-get -y upgrade \ && apt-get -y install --no-install-recommends curl ca-certificates devscripts equivs lsb-release \ && if [ "${VERSION_CODENAME}" = lunar ]; then apt-get -y install --no-install-recommends g++-10; fi \ - && echo "deb [trusted=yes] https://buildbot.mariadb.net/archive/builds/mariadb-4.x/latest/kvm-deb-${VERSION_CODENAME}-$(dpkg --print-architecture)-gal/debs ./" > /etc/apt/sources.list.d/galera-4.list \ - && sed -i -e s/arm64/aarch64/ -e s/ppc64el/ppc64le/ /etc/apt/sources.list.d/galera-4.list \ - && if [ "${VERSION_CODENAME}" = lunar ] && [ "$(dpkg --print-architecture)" = arm64 ]; then rm /etc/apt/sources.list.d/galera-4.list; fi \ - && if [ "${VERSION_CODENAME}" = trixie ] || [ "${VERSION_CODENAME}" = mantic ] || [ "$(getconf LONG_BIT)" = 32 ]; then rm /etc/apt/sources.list.d/galera-4.list; fi \ + && curl -s "https://ci.dev.mariadb.org/galera/mariadb-4.x-latest-gal-$(dpkg --print-architecture)-${ID}-$(echo "$VERSION_ID" | sed 's/\.//').sources" >/etc/apt/sources.list.d/galera-4.sources \ + && sed -i -e s/arm64/aarch64/ -e s/ppc64el/ppc64le/ /etc/apt/sources.list.d/galera-4.sources \ + && if [ "${VERSION_CODENAME}" = lunar ] && [ "$(dpkg --print-architecture)" = arm64 ]; then rm /etc/apt/sources.list.d/galera-4.sources; fi \ + && if [ "${VERSION_CODENAME}" = trixie ] || [ "${VERSION_CODENAME}" = mantic ] || [ "$(getconf LONG_BIT)" = 32 ]; then rm /etc/apt/sources.list.d/galera-4.sources; fi \ && apt-get update \ && curl -skO https://raw.githubusercontent.com/MariaDB/server/44e4b93316be8df130c6d87880da3500d83dbe10/debian/control \ && mkdir debian \ @@ -44,6 +44,7 @@ RUN . /etc/os-release; \ -t 'apt-get -y -o Debug::pkgProblemResolver=yes --no-install-recommends' \ && apt-get -y build-dep -q mariadb-server \ && apt-get -y install --no-install-recommends \ + apt-utils \ build-essential \ bzip2 \ ccache \