Skip to content
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

debian/ubuntu: fix apt sources list location #132

Merged
merged 4 commits into from
Jan 11, 2024

Conversation

crazy-max
Copy link
Collaborator

@crazy-max crazy-max commented Dec 21, 2023

related to moby/moby#44735 (comment)

needs #133

Since Ubuntu Noble 24.04 and Debian Bookworm, /etc/apt/sources.list has moved to /etc/apt/sources.list.d/ubuntu.sources and /etc/apt/sources.list.d/debian.sources respectively.

They also use the new deb822 format: https://repolib.readthedocs.io/en/latest/deb822-format.html

docker run --rm -it debian:12 cat /etc/apt/sources.list.d/debian.sources
Types: deb
# http://snapshot.debian.org/archive/debian/20231218T000000Z
URIs: http://deb.debian.org/debian
Suites: bookworm bookworm-updates
Components: main
Signed-By: /usr/share/keyrings/debian-archive-keyring.gpg

Types: deb
# http://snapshot.debian.org/archive/debian-security/20231218T000000Z
URIs: http://deb.debian.org/debian-security
Suites: bookworm-security
Components: main
Signed-By: /usr/share/keyrings/debian-archive-keyring.gpg

@crazy-max crazy-max marked this pull request as draft December 21, 2023 15:12
Copy link
Owner

@tonistiigi tonistiigi left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Lets add smth like xx-apt --print-source-dir ?

Signed-off-by: CrazyMax <1951866+crazy-max@users.noreply.github.com>
Signed-off-by: CrazyMax <1951866+crazy-max@users.noreply.github.com>
@crazy-max crazy-max force-pushed the fix-apt-sources branch 2 times, most recently from eec044b to e39bbc8 Compare January 10, 2024 09:35
Signed-off-by: CrazyMax <1951866+crazy-max@users.noreply.github.com>
@crazy-max crazy-max marked this pull request as ready for review January 10, 2024 10:01
@crazy-max crazy-max requested a review from tonistiigi January 10, 2024 10:01
Copy link
Owner

@tonistiigi tonistiigi left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What's the intention behind removing the mirrors?

@crazy-max
Copy link
Collaborator Author

crazy-max commented Jan 11, 2024

What's the intention behind removing the mirrors?

I'm not sure at which point it was necessary? Maybe there was some issues with main ones before? We removed it also in moby recently as it doesn't seem meaningful: moby/moby#46884

Also would need to handle apt source file correctly like 7634789#diff-f7c91877446336ef59ebfaacb472e50e4e40bbe54938f232b0fd54617eb6e7dcR35-R43 with proper domain handling to match debian or ubuntu.

Let me know if you want it back.

@tonistiigi tonistiigi merged commit 1fadfb2 into tonistiigi:master Jan 11, 2024
57 of 58 checks passed
@crazy-max crazy-max deleted the fix-apt-sources branch January 11, 2024 21:49
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.

2 participants