diff --git a/Dockerfile-curl.template b/Dockerfile-curl.template index 91ca28f..bc1c8c7 100644 --- a/Dockerfile-curl.template +++ b/Dockerfile-curl.template @@ -15,6 +15,7 @@ RUN set -eux; \ "buster", # 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/Dockerfile b/debian/trixie/Dockerfile new file mode 100644 index 0000000..9af772e --- /dev/null +++ b/debian/trixie/Dockerfile @@ -0,0 +1,63 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM buildpack-deps:trixie-scm + +RUN set -ex; \ + apt-get update; \ + apt-get install -y --no-install-recommends \ + autoconf \ + automake \ + bzip2 \ + dpkg-dev \ + file \ + g++ \ + gcc \ + imagemagick \ + libbz2-dev \ + libc6-dev \ + libcurl4-openssl-dev \ + libdb-dev \ + libevent-dev \ + libffi-dev \ + libgdbm-dev \ + libglib2.0-dev \ + libgmp-dev \ + libjpeg-dev \ + libkrb5-dev \ + liblzma-dev \ + libmagickcore-dev \ + libmagickwand-dev \ + libmaxminddb-dev \ + libncurses5-dev \ + libncursesw5-dev \ + libpng-dev \ + libpq-dev \ + libreadline-dev \ + libsqlite3-dev \ + libssl-dev \ + libtool \ + libwebp-dev \ + libxml2-dev \ + libxslt-dev \ + libyaml-dev \ + make \ + patch \ + unzip \ + xz-utils \ + zlib1g-dev \ + \ +# https://lists.debian.org/debian-devel-announce/2016/09/msg00000.html + $( \ +# if we use just "apt-cache show" here, it returns zero because "Can't select versions from package 'libmysqlclient-dev' as it is purely virtual", hence the pipe to grep + if apt-cache show 'default-libmysqlclient-dev' 2>/dev/null | grep -q '^Version:'; then \ + echo 'default-libmysqlclient-dev'; \ + else \ + echo 'libmysqlclient-dev'; \ + fi \ + ) \ + ; \ + rm -rf /var/lib/apt/lists/* diff --git a/debian/trixie/curl/Dockerfile b/debian/trixie/curl/Dockerfile new file mode 100644 index 0000000..46e2ec3 --- /dev/null +++ b/debian/trixie/curl/Dockerfile @@ -0,0 +1,18 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM debian:trixie + +RUN set -eux; \ + apt-get update; \ + apt-get install -y --no-install-recommends \ + ca-certificates \ + curl \ + gnupg \ + netbase \ + wget \ + ; \ + rm -rf /var/lib/apt/lists/* diff --git a/debian/trixie/scm/Dockerfile b/debian/trixie/scm/Dockerfile new file mode 100644 index 0000000..0983cce --- /dev/null +++ b/debian/trixie/scm/Dockerfile @@ -0,0 +1,17 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM buildpack-deps:trixie-curl + +# procps is very common in build systems, and is a reasonably small package +RUN apt-get update && apt-get install -y --no-install-recommends \ + git \ + mercurial \ + openssh-client \ + subversion \ + \ + procps \ + && rm -rf /var/lib/apt/lists/* diff --git a/versions.json b/versions.json index d30f395..2a8b0c2 100644 --- a/versions.json +++ b/versions.json @@ -31,6 +31,14 @@ "" ] }, + "debian/trixie": { + "suite": "testing", + "variants": [ + "curl", + "scm", + "" + ] + }, "ubuntu/focal": { "suite": "20.04", "variants": [