Merge pull request #150 from infosiftr/sq

Update "sq" availability matrix (yes trixie, no mantic)
docker-library · Nov 14, 2023 · c376415 · c376415
2 parents fdfe65e + 6b4838a
commit c376415
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/Dockerfile-curl.template b/Dockerfile-curl.template
@@ -8,14 +8,14 @@ RUN set -eux; \
 		gnupg \
 		netbase \
 {{ if [
-	# we want versions of "sq" that contain https://gitlab.com/sequoia-pgp/sequoia/-/commit/b41e1504cd29097328cb21f95808c9972188499e (and thus "sq keyserver" subcommands)
+	# we want versions of "sq" that contain https://gitlab.com/sequoia-pgp/sequoia/-/commit/b41e1504cd29097328cb21f95808c9972188499e (and thus "sq keyserver" subcommands; 0.26+)
 	# https://packages.debian.org/sq
-	# https://packages.ubuntu.com/sq
 	"bullseye", # 0.24
 	"buster",   # no sq
+	# https://packages.ubuntu.com/sq
+	"mantic",   # no sq
 	"jammy",    # 0.25
 	"focal",    # no sq
-	"trixie",   # no sq, https://github.com/docker-library/buildpack-deps/pull/149#issuecomment-1692238397
 	empty # trailing comma
 ] | index(env.codename) then "" else ( -}}
 		sq \

diff --git a/debian/trixie/curl/Dockerfile b/debian/trixie/curl/Dockerfile
diff --git a/ubuntu/mantic/curl/Dockerfile b/ubuntu/mantic/curl/Dockerfile