Skip to content

Fix docker-base-bookworm build #17795

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jan 20, 2024

Conversation

saiarcot895
Copy link
Contributor

Why I did it

Add a missing pip.conf file needed for docker-base-bookworm. Also fix the armhf and arm64 build of docker-base-bookworm, in a similar way to #17571.

Work item tracking
  • Microsoft ADO (number only): 26417271

How I did it

How to verify it

Which release branch to backport (provide reason below if selected)

  • 201811
  • 201911
  • 202006
  • 202012
  • 202106
  • 202111
  • 202205
  • 202211
  • 202305

Tested branch (Please provide the tested image version)

Description for the changelog

Link to config_db schema for YANG module changes

A picture of a cute animal (not mandatory but encouraged)

@k-v1
Copy link
Contributor

k-v1 commented Jan 16, 2024

@saiarcot895

I mentioned this earlier, but probably this was missed.
For bookworm dockers you can remove file apt-multiple-retries.
It was added only for bullseye. Bookworm by default has Acquire::Retries "3" (https://salsa.debian.org/apt-team/apt/-/commit/10631550f1f9788bdfd64d2434237a1448ab0626)

I can open PR for this, but waiting PRs review and merge for sonic-buildimage takes too long time (usually some months even for simple fixes).

It's not needed for Bookworm.

Signed-off-by: Saikrishna Arcot <[email protected]>
@saiarcot895
Copy link
Contributor Author

@k-v1 Thanks for that. I remember removing it for the Bookworm slave container, but I copied everything from docker-base-bullseye and so that file came in. I've removed it now.

@saiarcot895 saiarcot895 requested a review from yxieca January 17, 2024 00:45
@yxieca yxieca merged commit 96ae68f into sonic-net:master Jan 20, 2024
@saiarcot895 saiarcot895 deleted the fix-docker-base-bookworm branch January 20, 2024 01:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants