diff --git a/Dockerfile.template b/Dockerfile.template index 4b18f5c1..6f6c445c 100644 --- a/Dockerfile.template +++ b/Dockerfile.template @@ -4,10 +4,17 @@ FROM {{ env.owner }}buildpack-deps:{{ env.codename }}-scm RUN set -ex; \ apt-get update; \ apt-get install -y --no-install-recommends \ + $(for pkg in \ + default-libmysqlclient-dev \ + libmaxminddb-dev \ + ; do \ + if apt-cache show "${pkg}" >/dev/null 2>&1; then \ + echo "${pkg}"; \ + fi; \ + done) \ autoconf \ automake \ bzip2 \ - default-libmysqlclient-dev \ dpkg-dev \ file \ g++ \ @@ -27,7 +34,6 @@ RUN set -ex; \ liblzma-dev \ libmagickcore-dev \ libmagickwand-dev \ - libmaxminddb-dev \ libncurses5-dev \ libncursesw5-dev \ libpng-dev \ diff --git a/debian/bookworm/Dockerfile b/debian/bookworm/Dockerfile index 0a3a6547..936c374e 100644 --- a/debian/bookworm/Dockerfile +++ b/debian/bookworm/Dockerfile @@ -9,10 +9,17 @@ FROM buildpack-deps:bookworm-scm RUN set -ex; \ apt-get update; \ apt-get install -y --no-install-recommends \ + $(for pkg in \ + default-libmysqlclient-dev \ + libmaxminddb-dev \ + ; do \ + if apt-cache show "${pkg}" >/dev/null 2>&1; then \ + echo "${pkg}"; \ + fi; \ + done) \ autoconf \ automake \ bzip2 \ - default-libmysqlclient-dev \ dpkg-dev \ file \ g++ \ @@ -32,7 +39,6 @@ RUN set -ex; \ liblzma-dev \ libmagickcore-dev \ libmagickwand-dev \ - libmaxminddb-dev \ libncurses5-dev \ libncursesw5-dev \ libpng-dev \ diff --git a/debian/bullseye/Dockerfile b/debian/bullseye/Dockerfile index ce993b11..5cebba30 100644 --- a/debian/bullseye/Dockerfile +++ b/debian/bullseye/Dockerfile @@ -9,10 +9,17 @@ FROM buildpack-deps:bullseye-scm RUN set -ex; \ apt-get update; \ apt-get install -y --no-install-recommends \ + $(for pkg in \ + default-libmysqlclient-dev \ + libmaxminddb-dev \ + ; do \ + if apt-cache show "${pkg}" >/dev/null 2>&1; then \ + echo "${pkg}"; \ + fi; \ + done) \ autoconf \ automake \ bzip2 \ - default-libmysqlclient-dev \ dpkg-dev \ file \ g++ \ @@ -32,7 +39,6 @@ RUN set -ex; \ liblzma-dev \ libmagickcore-dev \ libmagickwand-dev \ - libmaxminddb-dev \ libncurses5-dev \ libncursesw5-dev \ libpng-dev \ diff --git a/debian/buster/Dockerfile b/debian/buster/Dockerfile index 8c3751a7..d1d1fbcb 100644 --- a/debian/buster/Dockerfile +++ b/debian/buster/Dockerfile @@ -9,10 +9,17 @@ FROM buildpack-deps:buster-scm RUN set -ex; \ apt-get update; \ apt-get install -y --no-install-recommends \ + $(for pkg in \ + default-libmysqlclient-dev \ + libmaxminddb-dev \ + ; do \ + if apt-cache show "${pkg}" >/dev/null 2>&1; then \ + echo "${pkg}"; \ + fi; \ + done) \ autoconf \ automake \ bzip2 \ - default-libmysqlclient-dev \ dpkg-dev \ file \ g++ \ @@ -32,7 +39,6 @@ RUN set -ex; \ liblzma-dev \ libmagickcore-dev \ libmagickwand-dev \ - libmaxminddb-dev \ libncurses5-dev \ libncursesw5-dev \ libpng-dev \ diff --git a/debian/sid/Dockerfile b/debian/sid/Dockerfile index 424b3dd1..c5faacf7 100644 --- a/debian/sid/Dockerfile +++ b/debian/sid/Dockerfile @@ -9,10 +9,17 @@ FROM buildpack-deps:sid-scm RUN set -ex; \ apt-get update; \ apt-get install -y --no-install-recommends \ + $(for pkg in \ + default-libmysqlclient-dev \ + libmaxminddb-dev \ + ; do \ + if apt-cache show "${pkg}" >/dev/null 2>&1; then \ + echo "${pkg}"; \ + fi; \ + done) \ autoconf \ automake \ bzip2 \ - default-libmysqlclient-dev \ dpkg-dev \ file \ g++ \ @@ -32,7 +39,6 @@ RUN set -ex; \ liblzma-dev \ libmagickcore-dev \ libmagickwand-dev \ - libmaxminddb-dev \ libncurses5-dev \ libncursesw5-dev \ libpng-dev \ diff --git a/debian/trixie/Dockerfile b/debian/trixie/Dockerfile index ebf05328..2744faaa 100644 --- a/debian/trixie/Dockerfile +++ b/debian/trixie/Dockerfile @@ -9,10 +9,17 @@ FROM buildpack-deps:trixie-scm RUN set -ex; \ apt-get update; \ apt-get install -y --no-install-recommends \ + $(for pkg in \ + default-libmysqlclient-dev \ + libmaxminddb-dev \ + ; do \ + if apt-cache show "${pkg}" >/dev/null 2>&1; then \ + echo "${pkg}"; \ + fi; \ + done) \ autoconf \ automake \ bzip2 \ - default-libmysqlclient-dev \ dpkg-dev \ file \ g++ \ @@ -32,7 +39,6 @@ RUN set -ex; \ liblzma-dev \ libmagickcore-dev \ libmagickwand-dev \ - libmaxminddb-dev \ libncurses5-dev \ libncursesw5-dev \ libpng-dev \ diff --git a/ubuntu/focal/Dockerfile b/ubuntu/focal/Dockerfile index 24391c25..792f4f71 100644 --- a/ubuntu/focal/Dockerfile +++ b/ubuntu/focal/Dockerfile @@ -9,10 +9,17 @@ FROM buildpack-deps:focal-scm RUN set -ex; \ apt-get update; \ apt-get install -y --no-install-recommends \ + $(for pkg in \ + default-libmysqlclient-dev \ + libmaxminddb-dev \ + ; do \ + if apt-cache show "${pkg}" >/dev/null 2>&1; then \ + echo "${pkg}"; \ + fi; \ + done) \ autoconf \ automake \ bzip2 \ - default-libmysqlclient-dev \ dpkg-dev \ file \ g++ \ @@ -32,7 +39,6 @@ RUN set -ex; \ liblzma-dev \ libmagickcore-dev \ libmagickwand-dev \ - libmaxminddb-dev \ libncurses5-dev \ libncursesw5-dev \ libpng-dev \ diff --git a/ubuntu/jammy/Dockerfile b/ubuntu/jammy/Dockerfile index 1ac749de..0d2ac48b 100644 --- a/ubuntu/jammy/Dockerfile +++ b/ubuntu/jammy/Dockerfile @@ -9,10 +9,17 @@ FROM buildpack-deps:jammy-scm RUN set -ex; \ apt-get update; \ apt-get install -y --no-install-recommends \ + $(for pkg in \ + default-libmysqlclient-dev \ + libmaxminddb-dev \ + ; do \ + if apt-cache show "${pkg}" >/dev/null 2>&1; then \ + echo "${pkg}"; \ + fi; \ + done) \ autoconf \ automake \ bzip2 \ - default-libmysqlclient-dev \ dpkg-dev \ file \ g++ \ @@ -32,7 +39,6 @@ RUN set -ex; \ liblzma-dev \ libmagickcore-dev \ libmagickwand-dev \ - libmaxminddb-dev \ libncurses5-dev \ libncursesw5-dev \ libpng-dev \ diff --git a/ubuntu/mantic/Dockerfile b/ubuntu/mantic/Dockerfile index f409d88b..9d6ca101 100644 --- a/ubuntu/mantic/Dockerfile +++ b/ubuntu/mantic/Dockerfile @@ -9,10 +9,17 @@ FROM buildpack-deps:mantic-scm RUN set -ex; \ apt-get update; \ apt-get install -y --no-install-recommends \ + $(for pkg in \ + default-libmysqlclient-dev \ + libmaxminddb-dev \ + ; do \ + if apt-cache show "${pkg}" >/dev/null 2>&1; then \ + echo "${pkg}"; \ + fi; \ + done) \ autoconf \ automake \ bzip2 \ - default-libmysqlclient-dev \ dpkg-dev \ file \ g++ \ @@ -32,7 +39,6 @@ RUN set -ex; \ liblzma-dev \ libmagickcore-dev \ libmagickwand-dev \ - libmaxminddb-dev \ libncurses5-dev \ libncursesw5-dev \ libpng-dev \ diff --git a/ubuntu/noble/Dockerfile b/ubuntu/noble/Dockerfile index 5f9de334..8a94092d 100644 --- a/ubuntu/noble/Dockerfile +++ b/ubuntu/noble/Dockerfile @@ -9,10 +9,17 @@ FROM buildpack-deps:noble-scm RUN set -ex; \ apt-get update; \ apt-get install -y --no-install-recommends \ + $(for pkg in \ + default-libmysqlclient-dev \ + libmaxminddb-dev \ + ; do \ + if apt-cache show "${pkg}" >/dev/null 2>&1; then \ + echo "${pkg}"; \ + fi; \ + done) \ autoconf \ automake \ bzip2 \ - default-libmysqlclient-dev \ dpkg-dev \ file \ g++ \ @@ -32,7 +39,6 @@ RUN set -ex; \ liblzma-dev \ libmagickcore-dev \ libmagickwand-dev \ - libmaxminddb-dev \ libncurses5-dev \ libncursesw5-dev \ libpng-dev \