From d416768b1a7f03919b9cf0fef6adc9dcad937888 Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Thu, 4 Jan 2024 13:52:40 -0800 Subject: [PATCH] Add `less` to Debian variants https://www.postgresql.org/docs/16/app-psql.html#APP-PSQL-META-COMMAND-PSET-PAGER https://github.com/postgres/postgres/blob/REL_16_1/src/include/fe_utils/print.h#L25 (if "less" is available, it gets used as the default pager for psql, and it only adds ~1.5MiB to our image size) --- 12/bookworm/Dockerfile | 4 ++++ 12/bullseye/Dockerfile | 4 ++++ 13/bookworm/Dockerfile | 4 ++++ 13/bullseye/Dockerfile | 4 ++++ 14/bookworm/Dockerfile | 4 ++++ 14/bullseye/Dockerfile | 4 ++++ 15/bookworm/Dockerfile | 4 ++++ 15/bullseye/Dockerfile | 4 ++++ 16/bookworm/Dockerfile | 4 ++++ 16/bullseye/Dockerfile | 4 ++++ Dockerfile-debian.template | 4 ++++ 11 files changed, 44 insertions(+) diff --git a/12/bookworm/Dockerfile b/12/bookworm/Dockerfile index 647dc8dc43..20968d7618 100644 --- a/12/bookworm/Dockerfile +++ b/12/bookworm/Dockerfile @@ -20,6 +20,10 @@ RUN set -ex; \ apt-get update; \ apt-get install -y --no-install-recommends \ gnupg \ +# https://www.postgresql.org/docs/16/app-psql.html#APP-PSQL-META-COMMAND-PSET-PAGER +# https://github.com/postgres/postgres/blob/REL_16_1/src/include/fe_utils/print.h#L25 +# (if "less" is available, it gets used as the default pager for psql, and it only adds ~1.5MiB to our image size) + less \ ; \ rm -rf /var/lib/apt/lists/* diff --git a/12/bullseye/Dockerfile b/12/bullseye/Dockerfile index 82386336a2..d311e72ebf 100644 --- a/12/bullseye/Dockerfile +++ b/12/bullseye/Dockerfile @@ -20,6 +20,10 @@ RUN set -ex; \ apt-get update; \ apt-get install -y --no-install-recommends \ gnupg \ +# https://www.postgresql.org/docs/16/app-psql.html#APP-PSQL-META-COMMAND-PSET-PAGER +# https://github.com/postgres/postgres/blob/REL_16_1/src/include/fe_utils/print.h#L25 +# (if "less" is available, it gets used as the default pager for psql, and it only adds ~1.5MiB to our image size) + less \ ; \ rm -rf /var/lib/apt/lists/* diff --git a/13/bookworm/Dockerfile b/13/bookworm/Dockerfile index 1086785f54..a98e9c3f2c 100644 --- a/13/bookworm/Dockerfile +++ b/13/bookworm/Dockerfile @@ -20,6 +20,10 @@ RUN set -ex; \ apt-get update; \ apt-get install -y --no-install-recommends \ gnupg \ +# https://www.postgresql.org/docs/16/app-psql.html#APP-PSQL-META-COMMAND-PSET-PAGER +# https://github.com/postgres/postgres/blob/REL_16_1/src/include/fe_utils/print.h#L25 +# (if "less" is available, it gets used as the default pager for psql, and it only adds ~1.5MiB to our image size) + less \ ; \ rm -rf /var/lib/apt/lists/* diff --git a/13/bullseye/Dockerfile b/13/bullseye/Dockerfile index 0f2b30c55e..a4374dfff1 100644 --- a/13/bullseye/Dockerfile +++ b/13/bullseye/Dockerfile @@ -20,6 +20,10 @@ RUN set -ex; \ apt-get update; \ apt-get install -y --no-install-recommends \ gnupg \ +# https://www.postgresql.org/docs/16/app-psql.html#APP-PSQL-META-COMMAND-PSET-PAGER +# https://github.com/postgres/postgres/blob/REL_16_1/src/include/fe_utils/print.h#L25 +# (if "less" is available, it gets used as the default pager for psql, and it only adds ~1.5MiB to our image size) + less \ ; \ rm -rf /var/lib/apt/lists/* diff --git a/14/bookworm/Dockerfile b/14/bookworm/Dockerfile index 4905043349..096e32d754 100644 --- a/14/bookworm/Dockerfile +++ b/14/bookworm/Dockerfile @@ -20,6 +20,10 @@ RUN set -ex; \ apt-get update; \ apt-get install -y --no-install-recommends \ gnupg \ +# https://www.postgresql.org/docs/16/app-psql.html#APP-PSQL-META-COMMAND-PSET-PAGER +# https://github.com/postgres/postgres/blob/REL_16_1/src/include/fe_utils/print.h#L25 +# (if "less" is available, it gets used as the default pager for psql, and it only adds ~1.5MiB to our image size) + less \ ; \ rm -rf /var/lib/apt/lists/* diff --git a/14/bullseye/Dockerfile b/14/bullseye/Dockerfile index 95e24e495a..e507624db1 100644 --- a/14/bullseye/Dockerfile +++ b/14/bullseye/Dockerfile @@ -20,6 +20,10 @@ RUN set -ex; \ apt-get update; \ apt-get install -y --no-install-recommends \ gnupg \ +# https://www.postgresql.org/docs/16/app-psql.html#APP-PSQL-META-COMMAND-PSET-PAGER +# https://github.com/postgres/postgres/blob/REL_16_1/src/include/fe_utils/print.h#L25 +# (if "less" is available, it gets used as the default pager for psql, and it only adds ~1.5MiB to our image size) + less \ ; \ rm -rf /var/lib/apt/lists/* diff --git a/15/bookworm/Dockerfile b/15/bookworm/Dockerfile index af0da3d468..f05387d1d2 100644 --- a/15/bookworm/Dockerfile +++ b/15/bookworm/Dockerfile @@ -20,6 +20,10 @@ RUN set -ex; \ apt-get update; \ apt-get install -y --no-install-recommends \ gnupg \ +# https://www.postgresql.org/docs/16/app-psql.html#APP-PSQL-META-COMMAND-PSET-PAGER +# https://github.com/postgres/postgres/blob/REL_16_1/src/include/fe_utils/print.h#L25 +# (if "less" is available, it gets used as the default pager for psql, and it only adds ~1.5MiB to our image size) + less \ ; \ rm -rf /var/lib/apt/lists/* diff --git a/15/bullseye/Dockerfile b/15/bullseye/Dockerfile index 2d9db9bb37..b091bc4425 100644 --- a/15/bullseye/Dockerfile +++ b/15/bullseye/Dockerfile @@ -20,6 +20,10 @@ RUN set -ex; \ apt-get update; \ apt-get install -y --no-install-recommends \ gnupg \ +# https://www.postgresql.org/docs/16/app-psql.html#APP-PSQL-META-COMMAND-PSET-PAGER +# https://github.com/postgres/postgres/blob/REL_16_1/src/include/fe_utils/print.h#L25 +# (if "less" is available, it gets used as the default pager for psql, and it only adds ~1.5MiB to our image size) + less \ ; \ rm -rf /var/lib/apt/lists/* diff --git a/16/bookworm/Dockerfile b/16/bookworm/Dockerfile index 15369fd019..a2bde2b26a 100644 --- a/16/bookworm/Dockerfile +++ b/16/bookworm/Dockerfile @@ -20,6 +20,10 @@ RUN set -ex; \ apt-get update; \ apt-get install -y --no-install-recommends \ gnupg \ +# https://www.postgresql.org/docs/16/app-psql.html#APP-PSQL-META-COMMAND-PSET-PAGER +# https://github.com/postgres/postgres/blob/REL_16_1/src/include/fe_utils/print.h#L25 +# (if "less" is available, it gets used as the default pager for psql, and it only adds ~1.5MiB to our image size) + less \ ; \ rm -rf /var/lib/apt/lists/* diff --git a/16/bullseye/Dockerfile b/16/bullseye/Dockerfile index b132cc211b..5d0cd70a12 100644 --- a/16/bullseye/Dockerfile +++ b/16/bullseye/Dockerfile @@ -20,6 +20,10 @@ RUN set -ex; \ apt-get update; \ apt-get install -y --no-install-recommends \ gnupg \ +# https://www.postgresql.org/docs/16/app-psql.html#APP-PSQL-META-COMMAND-PSET-PAGER +# https://github.com/postgres/postgres/blob/REL_16_1/src/include/fe_utils/print.h#L25 +# (if "less" is available, it gets used as the default pager for psql, and it only adds ~1.5MiB to our image size) + less \ ; \ rm -rf /var/lib/apt/lists/* diff --git a/Dockerfile-debian.template b/Dockerfile-debian.template index 588fced34d..878e813250 100644 --- a/Dockerfile-debian.template +++ b/Dockerfile-debian.template @@ -14,6 +14,10 @@ RUN set -ex; \ apt-get update; \ apt-get install -y --no-install-recommends \ gnupg \ +# https://www.postgresql.org/docs/16/app-psql.html#APP-PSQL-META-COMMAND-PSET-PAGER +# https://github.com/postgres/postgres/blob/REL_16_1/src/include/fe_utils/print.h#L25 +# (if "less" is available, it gets used as the default pager for psql, and it only adds ~1.5MiB to our image size) + less \ ; \ rm -rf /var/lib/apt/lists/*