8000 Add Debian Trixie (and remove Bullseye) · docker-library/python@40e9fa6 · GitHub
[go: up one dir, main page]
Skip to content

Commit 40e9fa6

Browse files
tianontianon
committed
Add Debian Trixie (and remove Bullseye)
1 parent 4c3ad30 commit 40e9fa6

File tree

21 files changed

+181
-51
lines changed

21 files changed

+181
-51
lines changed

‎3.10/slim-bookworm/Dockerfile

Lines changed: 12 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎3.10/slim-bullseye/Dockerfile renamed to ‎3.10/slim-trixie/Dockerfile

Lines changed: 13 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎3.10/bullseye/Dockerfile renamed to ‎3.10/trixie/Dockerfile

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎3.11/slim-bookworm/Dockerfile

Lines changed: 12 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎3.11/slim-bullseye/Dockerfile renamed to ‎3.11/slim-trixie/Dockerfile

Lines changed: 13 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎3.11/bullseye/Dockerfile renamed to ‎3.11/trixie/Dockerfile

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎3.12/slim-bookworm/Dockerfile

Lines changed: 12 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎3.12/slim-bullseye/Dockerfile renamed to ‎3.12/slim-trixie/Dockerfile

Lines changed: 13 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎3.12/bullseye/Dockerfile renamed to ‎3.12/trixie/Dockerfile

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎3.13/slim-bookworm/Dockerfile

Lines changed: 12 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎3.13/slim-bullseye/Dockerfile renamed to ‎3.13/slim-trixie/Dockerfile

Lines changed: 13 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎3.13/bullseye/Dockerfile renamed to ‎3.13/trixie/Dockerfile

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎3.14-rc/slim-bookworm/Dockerfile

Lines changed: 12 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎3.14-rc/slim-bullseye/Dockerfile renamed to ‎3.14-rc/slim-trixie/Dockerfile

Lines changed: 13 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎3.14-rc/bullseye/Dockerfile renamed to ‎3.14-rc/trixie/Dockerfile

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎3.9/slim-bookworm/Dockerfile

Lines changed: 12 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎3.9/slim-bullseye/Dockerfile renamed to ‎3.9/slim-trixie/Dockerfile

Lines changed: 13 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎3.9/bullseye/Dockerfile renamed to ‎3.9/trixie/Dockerfile

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Dockerfile-linux.template

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -283,8 +283,18 @@ RUN set -eux; \
283283
find /usr/local -type f -executable -not \( -name '*tkinter*' \) -exec ldd '{}' ';' \
284284
| awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); printf "*%s\n", so }' \
285285
| sort -u \
286-
| xargs -r dpkg-query --search \
287-
| cut -d: -f1 \
286+
| xargs -rt dpkg-query --search \
287+
# https://manpages.debian.org/bookworm/dpkg/dpkg-query.1.en.html#S
288+
| awk ' \
289+
# print all lines to stderr for easier debugging
290+
{ print > "/dev/stderr" } \
291+
# diversion by pkgname from: diverted-from
292+
# diversion by pkgname to: diverted-to
293+
$1 == "diversion" && $2 == "by" { print $3; next } \
294+
# pkgname3: pathname2
295+
$1 ~ /:$/ { gsub(":$", "", $1); print $1; next } \
296+
# technically this won't handle "pkgname1, pkgname2: pathname1" but that's going to be *really* unusual for the .so files we're searching here
297+
' \
288298
| sort -u \
289299
| xargs -r apt-mark manual \
290300
; \

0 commit comments

Comments
 (0)
0