matthew/sonic-buildimage
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix docker-base-bookworm build (#17795)

Browse Source 
* Add missing pip.conf for docker-base-bookworm

Signed-off-by: Saikrishna Arcot <sarcot@microsoft.com>
This commit is contained in:
Saikrishna Arcot 2024-01-19 17:25:31 -08:00 committed by GitHub
parent 3da08d340c
commit 96ae68fedf
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
dockers/docker-base-bookworm/Dockerfile.j2
View File

@ -1,9 +1,9 @@
{% set prefix = DEFAULT_CONTAINER_REGISTRY %} {% set prefix = DEFAULT_CONTAINER_REGISTRY %}
{% from "dockers/dockerfile-macros.j2" import install_debian_packages, install_python_wheels, copy_files %} {% 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") %} {% 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") %} {% 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 %} {% else %}
FROM {{ prefix }}{{DOCKER_BASE_ARCH}}/debian:bookworm FROM {{ prefix }}{{DOCKER_BASE_ARCH}}/debian:bookworm
{% endif %} {% 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 ["sources.list.{{ CONFIGURED_ARCH }}", "/etc/apt/sources.list"]
COPY ["no_install_recommend_suggest", "/etc/apt/apt.conf.d"] COPY ["no_install_recommend_suggest", "/etc/apt/apt.conf.d"]
COPY ["no-check-valid-until", "/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 # Update apt cache and
# pre-install fundamental packages # pre-install fundamental packages

4
dockers/docker-base-bookworm/apt-multiple-retries
View File

@ -1,4 +0,0 @@
# Instruct apt to retry downloads on failures
# This is required only for bullseye.
Acquire::Retries "3";

2
dockers/docker-base-bookworm/pip.conf Normal file
View File

@ -0,0 +1,2 @@
[global]
break-system-packages = true