diff --git a/dockers/docker-base-bookworm/Dockerfile.j2 b/dockers/docker-base-bookworm/Dockerfile.j2 index cad47da408..e500259bb9 100644 --- a/dockers/docker-base-bookworm/Dockerfile.j2 +++ b/dockers/docker-base-bookworm/Dockerfile.j2 @@ -1,9 +1,9 @@ {% set prefix = DEFAULT_CONTAINER_REGISTRY %} {% from "dockers/dockerfile-macros.j2" import install_debian_packages, install_python_wheels, copy_files %} {% if CONFIGURED_ARCH == "armhf" and (MULTIARCH_QEMU_ENVIRON == "y" or CROSS_BUILD_ENVIRON == "y") %} -FROM {{ prefix }}multiarch/debian-debootstrap:armhf-bookworm +FROM --platform=linux/arm/v7 {{ prefix }}debian:bookworm {% elif CONFIGURED_ARCH == "arm64" and (MULTIARCH_QEMU_ENVIRON == "y" or CROSS_BUILD_ENVIRON == "y") %} -FROM {{ prefix }}multiarch/debian-debootstrap:arm64-bookworm +FROM --platform=linux/arm64 {{ prefix }}debian:bookworm {% else %} FROM {{ prefix }}{{DOCKER_BASE_ARCH}}/debian:bookworm {% endif %} @@ -30,7 +30,6 @@ COPY ["dpkg_01_drop", "/etc/dpkg/dpkg.cfg.d/01_drop"] COPY ["sources.list.{{ CONFIGURED_ARCH }}", "/etc/apt/sources.list"] COPY ["no_install_recommend_suggest", "/etc/apt/apt.conf.d"] COPY ["no-check-valid-until", "/etc/apt/apt.conf.d"] -COPY ["apt-multiple-retries", "/etc/apt/apt.conf.d"] # Update apt cache and # pre-install fundamental packages diff --git a/dockers/docker-base-bookworm/apt-multiple-retries b/dockers/docker-base-bookworm/apt-multiple-retries deleted file mode 100644 index c4c638252f..0000000000 --- a/dockers/docker-base-bookworm/apt-multiple-retries +++ /dev/null @@ -1,4 +0,0 @@ -# Instruct apt to retry downloads on failures -# This is required only for bullseye. - -Acquire::Retries "3"; diff --git a/dockers/docker-base-bookworm/pip.conf b/dockers/docker-base-bookworm/pip.conf new file mode 100644 index 0000000000..9d54ef9028 --- /dev/null +++ b/dockers/docker-base-bookworm/pip.conf @@ -0,0 +1,2 @@ +[global] +break-system-packages = true