docker-library · Earlopain · Aug 7, 2025
diff --git a/3.2/bookworm/Dockerfile b/3.2/bookworm/Dockerfile
diff --git a/3.2/slim-bookworm/Dockerfile b/3.2/slim-bookworm/Dockerfile
diff --git a/3.2/slim-bullseye/Dockerfile → 3.2/slim-trixie/Dockerfile b/3.2/slim-bullseye/Dockerfile → 3.2/slim-trixie/Dockerfile
diff --git a/3.2/bullseye/Dockerfile → 3.2/trixie/Dockerfile b/3.2/bullseye/Dockerfile → 3.2/trixie/Dockerfile
diff --git a/3.3/bookworm/Dockerfile b/3.3/bookworm/Dockerfile
diff --git a/3.3/slim-bookworm/Dockerfile b/3.3/slim-bookworm/Dockerfile
diff --git a/3.3/slim-bullseye/Dockerfile → 3.3/slim-trixie/Dockerfile b/3.3/slim-bullseye/Dockerfile → 3.3/slim-trixie/Dockerfile
diff --git a/3.3/bullseye/Dockerfile → 3.3/trixie/Dockerfile b/3.3/bullseye/Dockerfile → 3.3/trixie/Dockerfile
diff --git a/3.4/bookworm/Dockerfile b/3.4/bookworm/Dockerfile
diff --git a/3.4/slim-bookworm/Dockerfile b/3.4/slim-bookworm/Dockerfile
diff --git a/3.4/slim-bullseye/Dockerfile → 3.4/slim-trixie/Dockerfile b/3.4/slim-bullseye/Dockerfile → 3.4/slim-trixie/Dockerfile
diff --git a/3.4/bullseye/Dockerfile → 3.4/trixie/Dockerfile b/3.4/bullseye/Dockerfile → 3.4/trixie/Dockerfile
diff --git a/3.5-rc/bookworm/Dockerfile b/3.5-rc/bookworm/Dockerfile
diff --git a/3.5-rc/slim-bookworm/Dockerfile b/3.5-rc/slim-bookworm/Dockerfile
diff --git a/3.5-rc/slim-bullseye/Dockerfile → 3.5-rc/slim-trixie/Dockerfile b/3.5-rc/slim-bullseye/Dockerfile → 3.5-rc/slim-trixie/Dockerfile
diff --git a/3.5-rc/bullseye/Dockerfile → 3.5-rc/trixie/Dockerfile b/3.5-rc/bullseye/Dockerfile → 3.5-rc/trixie/Dockerfile
diff --git a/Dockerfile.template b/Dockerfile.template
@@ -4,6 +4,12 @@
 	;
 	def is_slim:
 		env.variant | startswith("slim-")
+	;
+	def clean_apt:
+		# TODO once bookworm is EOL, remove this and just hard-code "apt-get dist-clean" instead
+		if env.variant | contains("bookworm") then
+			"rm -rf /var/lib/apt/lists/*"
+		else "apt-get dist-clean" end
 -}}
 {{ if is_alpine then ( -}}
 FROM alpine:{{ env.variant | ltrimstr("alpine") }}
@@ -19,7 +25,7 @@ RUN set -eux; \
 	apt-get install -y --no-install-recommends \
 		ca-certificates \
 	; \
-	rm -rf /var/lib/apt/lists/*
+	{{ clean_apt }}
 
 {{ ) else "" end -}}
 # skip installing gem documentation with `gem install`/`gem update`
@@ -228,12 +234,13 @@ RUN set -eux; \
 		| awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); printf "*%s\n", so }' \
 		| sort -u \
 		| xargs -r dpkg-query --search \
-		| cut -d: -f1 \
+# https://manpages.debian.org/bookworm/dpkg/dpkg-query.1.en.html#S (we ignore diversions and it'll be really unusual for more than one package to provide any given .so file)
+		| awk 'sub(":$", "", $1) { print $1 }' \
 		| sort -u \
 		| xargs -r apt-mark manual \
 	; \
 	apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
-	rm -rf /var/lib/apt/lists/*; \
+	{{ clean_apt }}; \
 {{ ) end -}}
 	\
 	cd /; \