Add debian:bookworm, drop buster

Signed-off-by: Ivan Prisyazhnyy <[email protected]>

Author: sitano

3.0/buster/Dockerfile renamed to 3.0/bookworm/Dockerfile

@@ -4,6 +4,9 @@
 	;
 	def is_slim:
 		env.variant | startswith("slim-")
+	;
+	def need_openssl:
+		.openssl.versions | index(env.variant)
 -}}
 {{ if is_alpine then ( -}}
 FROM alpine:{{ env.variant | ltrimstr("alpine") }}
@@ -119,6 +122,20 @@ RUN set -eux; \
 	; \
 	rm -rf /var/lib/apt/lists/*; \
 {{ ) end -}}
+{{ if need_openssl then ( -}}
+	\
+	wget -O /tmp/{{ .openssl.ssl.name }} "{{ .openssl.ssl.url }}"; \
+	wget -O /tmp/{{ .openssl.dev.name }} "{{ .openssl.dev.url }}"; \
+	\
+	dpkg -i /tmp/{{ .openssl.ssl.name }}; \
+	dpkg -i /tmp/{{ .openssl.dev.name }}; \
+	\
+	echo "{{ .openssl.ssl.sha256 }} /tmp/{{ .openssl.ssl.name }}" | sha256sum --check --strict; \
+	echo "{{ .openssl.dev.sha256 }} /tmp/{{ .openssl.dev.name }}" | sha256sum --check --strict; \
+	\
+	rm /tmp/{{ .openssl.ssl.name }}; \
+	rm /tmp/{{ .openssl.dev.name }}; \
+{{ ) else "" end  -}}
 {{ if .rust.version then ( -}}
 	\
 	rustArch=; \
@@ -262,14 +279,17 @@ RUN set -eux; \
 	apt-mark auto '.*' > /dev/null; \
 	apt-mark manual $savedAptMark > /dev/null; \
 	find /usr/local -type f -executable -not \( -name '*tkinter*' \) -exec ldd '{}' ';' \
-		| awk '/=>/ { print $(NF-1) }' \
+		| awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \
 		| sort -u \
 		| grep -vE '^/usr/local/lib/' \
 		| xargs -r dpkg-query --search \
 		| cut -d: -f1 \
 		| sort -u \
 		| xargs -r apt-mark manual \
 	; \
+{{ if need_openssl then ( -}}
+	apt-mark manual {{ .openssl.ssl.lib }}; \
+{{ ) else "" end  -}}
 	apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
 {{ ) end -}}
 	\

3.0/bullseye/Dockerfile

@@ -2,21 +2,21 @@
   "3.0": {
     "sha256": "b5cbee93e62d85cfb2a408c49fa30a74231ae8409c2b3858e5f5ea254d7ddbd1",
     "variants": [
+      "bookworm",
+      "slim-bookworm",
       "bullseye",
       "slim-bullseye",
-      "buster",
-      "slim-buster",
       "alpine3.16"
     ],
     "version": "3.0.6"
   },
   "3.1": {
     "sha256": "1b6d6010e76036c937b9671f4752f065aeca800a6c664f71f6c9a699453af94f",
     "variants": [
+      "bookworm",
+      "slim-bookworm",
       "bullseye",
       "slim-bullseye",
-      "buster",
-      "slim-buster",
       "alpine3.18",
       "alpine3.17"
     ],
@@ -57,10 +57,10 @@
     },
     "sha256": "4b352d0f7ec384e332e3e44cdbfdcd5ff2d594af3c8296b5636c710975149e23",
     "variants": [
+      "bookworm",
+      "slim-bookworm",
       "bullseye",
       "slim-bullseye",
-      "buster",
-      "slim-buster",
       "alpine3.18",
       "alpine3.17"
     ],
@@ -101,10 +101,10 @@
     },
     "sha256": "ae300b49e06c13087dd163b97eddd38db895dc8e0c9904284119795d75303fbb",
     "variants": [
+      "bookworm",
+      "slim-bookworm",
       "bullseye",
       "slim-bullseye",
-      "buster",
-      "slim-buster",
       "alpine3.18",
       "alpine3.17"
     ],

3.0/slim-buster/Dockerfile renamed to 3.0/slim-bookworm/Dockerfile

@@ -70,8 +70,8 @@ for version in "${versions[@]}"; do
 			sha256: env.shaVal,
 			variants: [
 				(
+					"bookworm",
 					"bullseye",
-					"buster",
 					empty # trailing comma hack
 				| ., "slim-" + .), # https://github.com/docker-library/ruby/pull/142#issuecomment-320012893
 				(