From 47ff5548471e77c54c801a06adb85aba6446bc33 Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Fri, 28 Apr 2023 15:14:14 -0700 Subject: [PATCH] Remove explicit `dirmngr` reference MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This is pulled in automatically via `gnupg`, and moved from `Recommends` to `Depends` in https://salsa.debian.org/debian/gnupg2/-/commit/99474ad900a8bcdd0e7b68f986fec0013fc01470, which has been part of `src:gnupg2` since 2.1.21-4 (and every supported version of both Debian _and_ Ubuntu have 2.2.x 😇). --- 6.0/Dockerfile | 2 +- 6.2/Dockerfile | 2 +- 7.0/Dockerfile | 2 +- 7.2-rc/Dockerfile | 2 +- Dockerfile.template | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/6.0/Dockerfile b/6.0/Dockerfile index 24537450d..c141dc691 100644 --- a/6.0/Dockerfile +++ b/6.0/Dockerfile @@ -9,7 +9,7 @@ ENV GOSU_VERSION 1.16 RUN set -eux; \ savedAptMark="$(apt-mark showmanual)"; \ apt-get update; \ - apt-get install -y --no-install-recommends ca-certificates dirmngr gnupg wget; \ + apt-get install -y --no-install-recommends ca-certificates gnupg wget; \ rm -rf /var/lib/apt/lists/*; \ dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')"; \ wget -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$dpkgArch"; \ diff --git a/6.2/Dockerfile b/6.2/Dockerfile index 0b9b1fafe..74e610c77 100644 --- a/6.2/Dockerfile +++ b/6.2/Dockerfile @@ -9,7 +9,7 @@ ENV GOSU_VERSION 1.16 RUN set -eux; \ savedAptMark="$(apt-mark showmanual)"; \ apt-get update; \ - apt-get install -y --no-install-recommends ca-certificates dirmngr gnupg wget; \ + apt-get install -y --no-install-recommends ca-certificates gnupg wget; \ rm -rf /var/lib/apt/lists/*; \ dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')"; \ wget -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$dpkgArch"; \ diff --git a/7.0/Dockerfile b/7.0/Dockerfile index c7b1a0cc4..dc651246d 100644 --- a/7.0/Dockerfile +++ b/7.0/Dockerfile @@ -9,7 +9,7 @@ ENV GOSU_VERSION 1.16 RUN set -eux; \ savedAptMark="$(apt-mark showmanual)"; \ apt-get update; \ - apt-get install -y --no-install-recommends ca-certificates dirmngr gnupg wget; \ + apt-get install -y --no-install-recommends ca-certificates gnupg wget; \ rm -rf /var/lib/apt/lists/*; \ dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')"; \ wget -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$dpkgArch"; \ diff --git a/7.2-rc/Dockerfile b/7.2-rc/Dockerfile index 9ec793d9a..9b30d3107 100644 --- a/7.2-rc/Dockerfile +++ b/7.2-rc/Dockerfile @@ -9,7 +9,7 @@ ENV GOSU_VERSION 1.16 RUN set -eux; \ savedAptMark="$(apt-mark showmanual)"; \ apt-get update; \ - apt-get install -y --no-install-recommends ca-certificates dirmngr gnupg wget; \ + apt-get install -y --no-install-recommends ca-certificates gnupg wget; \ rm -rf /var/lib/apt/lists/*; \ dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')"; \ wget -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$dpkgArch"; \ diff --git a/Dockerfile.template b/Dockerfile.template index 6921f8888..df7c56cf6 100644 --- a/Dockerfile.template +++ b/Dockerfile.template @@ -9,7 +9,7 @@ ENV GOSU_VERSION 1.16 RUN set -eux; \ savedAptMark="$(apt-mark showmanual)"; \ apt-get update; \ - apt-get install -y --no-install-recommends ca-certificates dirmngr gnupg wget; \ + apt-get install -y --no-install-recommends ca-certificates gnupg wget; \ rm -rf /var/lib/apt/lists/*; \ dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')"; \ wget -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$dpkgArch"; \