You've already forked postgres
mirror of
https://github.com/docker-library/postgres.git
synced 2025-07-26 23:21:10 +03:00
Remove explicit dirmngr reference
This is pulled in automatically via `gnupg`, and moved from `Recommends` to `Depends` in 99474ad900, 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 😇).
This commit is contained in:
Tianon Gravi
19
11/bullseye/Dockerfile
generated
19
11/bullseye/Dockerfile
generated
@ -6,16 +6,6 @@
|
||||
|
||||
FROM debian:bullseye-slim
|
||||
|
||||
RUN set -ex; \
|
||||
if ! command -v gpg > /dev/null; then \
|
||||
apt-get update; \
|
||||
apt-get install -y --no-install-recommends \
|
||||
gnupg \
|
||||
dirmngr \
|
||||
; \
|
||||
rm -rf /var/lib/apt/lists/*; \
|
||||
fi
|
||||
|
||||
# explicitly set user/group IDs
|
||||
RUN set -eux; \
|
||||
groupadd -r postgres --gid=999; \
|
||||
@ -26,6 +16,13 @@ RUN set -eux; \
|
||||
mkdir -p /var/lib/postgresql; \
|
||||
chown -R postgres:postgres /var/lib/postgresql
|
||||
|
||||
RUN set -ex; \
|
||||
apt-get update; \
|
||||
apt-get install -y --no-install-recommends \
|
||||
gnupg \
|
||||
; \
|
||||
rm -rf /var/lib/apt/lists/*
|
||||
|
||||
# grab gosu for easy step-down from root
|
||||
# https://github.com/tianon/gosu/releases
|
||||
ENV GOSU_VERSION 1.16
|
||||
@ -81,7 +78,7 @@ RUN set -ex; \
|
||||
mkdir -p /usr/local/share/keyrings/; \
|
||||
gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "$key"; \
|
||||
gpg --batch --export --armor "$key" > /usr/local/share/keyrings/postgres.gpg.asc; \
|
||||
command -v gpgconf > /dev/null && gpgconf --kill all; \
|
||||
gpgconf --kill all; \
|
||||
rm -rf "$GNUPGHOME"
|
||||
|
||||
ENV PG_MAJOR 11
|
||||
|
||||
19
12/bullseye/Dockerfile
generated
19
12/bullseye/Dockerfile
generated
@ -6,16 +6,6 @@
|
||||
|
||||
FROM debian:bullseye-slim
|
||||
|
||||
RUN set -ex; \
|
||||
if ! command -v gpg > /dev/null; then \
|
||||
apt-get update; \
|
||||
apt-get install -y --no-install-recommends \
|
||||
gnupg \
|
||||
dirmngr \
|
||||
; \
|
||||
rm -rf /var/lib/apt/lists/*; \
|
||||
fi
|
||||
|
||||
# explicitly set user/group IDs
|
||||
RUN set -eux; \
|
||||
groupadd -r postgres --gid=999; \
|
||||
@ -26,6 +16,13 @@ RUN set -eux; \
|
||||
mkdir -p /var/lib/postgresql; \
|
||||
chown -R postgres:postgres /var/lib/postgresql
|
||||
|
||||
RUN set -ex; \
|
||||
apt-get update; \
|
||||
apt-get install -y --no-install-recommends \
|
||||
gnupg \
|
||||
; \
|
||||
rm -rf /var/lib/apt/lists/*
|
||||
|
||||
# grab gosu for easy step-down from root
|
||||
# https://github.com/tianon/gosu/releases
|
||||
ENV GOSU_VERSION 1.16
|
||||
@ -81,7 +78,7 @@ RUN set -ex; \
|
||||
mkdir -p /usr/local/share/keyrings/; \
|
||||
gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "$key"; \
|
||||
gpg --batch --export --armor "$key" > /usr/local/share/keyrings/postgres.gpg.asc; \
|
||||
command -v gpgconf > /dev/null && gpgconf --kill all; \
|
||||
gpgconf --kill all; \
|
||||
rm -rf "$GNUPGHOME"
|
||||
|
||||
ENV PG_MAJOR 12
|
||||
|
||||
19
13/bullseye/Dockerfile
generated
19
13/bullseye/Dockerfile
generated
@ -6,16 +6,6 @@
|
||||
|
||||
FROM debian:bullseye-slim
|
||||
|
||||
RUN set -ex; \
|
||||
if ! command -v gpg > /dev/null; then \
|
||||
apt-get update; \
|
||||
apt-get install -y --no-install-recommends \
|
||||
gnupg \
|
||||
dirmngr \
|
||||
; \
|
||||
rm -rf /var/lib/apt/lists/*; \
|
||||
fi
|
||||
|
||||
# explicitly set user/group IDs
|
||||
RUN set -eux; \
|
||||
groupadd -r postgres --gid=999; \
|
||||
@ -26,6 +16,13 @@ RUN set -eux; \
|
||||
mkdir -p /var/lib/postgresql; \
|
||||
chown -R postgres:postgres /var/lib/postgresql
|
||||
|
||||
RUN set -ex; \
|
||||
apt-get update; \
|
||||
apt-get install -y --no-install-recommends \
|
||||
gnupg \
|
||||
; \
|
||||
rm -rf /var/lib/apt/lists/*
|
||||
|
||||
# grab gosu for easy step-down from root
|
||||
# https://github.com/tianon/gosu/releases
|
||||
ENV GOSU_VERSION 1.16
|
||||
@ -81,7 +78,7 @@ RUN set -ex; \
|
||||
mkdir -p /usr/local/share/keyrings/; \
|
||||
gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "$key"; \
|
||||
gpg --batch --export --armor "$key" > /usr/local/share/keyrings/postgres.gpg.asc; \
|
||||
command -v gpgconf > /dev/null && gpgconf --kill all; \
|
||||
gpgconf --kill all; \
|
||||
rm -rf "$GNUPGHOME"
|
||||
|
||||
ENV PG_MAJOR 13
|
||||
|
||||
19
14/bullseye/Dockerfile
generated
19
14/bullseye/Dockerfile
generated
@ -6,16 +6,6 @@
|
||||
|
||||
FROM debian:bullseye-slim
|
||||
|
||||
RUN set -ex; \
|
||||
if ! command -v gpg > /dev/null; then \
|
||||
apt-get update; \
|
||||
apt-get install -y --no-install-recommends \
|
||||
gnupg \
|
||||
dirmngr \
|
||||
; \
|
||||
rm -rf /var/lib/apt/lists/*; \
|
||||
fi
|
||||
|
||||
# explicitly set user/group IDs
|
||||
RUN set -eux; \
|
||||
groupadd -r postgres --gid=999; \
|
||||
@ -26,6 +16,13 @@ RUN set -eux; \
|
||||
mkdir -p /var/lib/postgresql; \
|
||||
chown -R postgres:postgres /var/lib/postgresql
|
||||
|
||||
RUN set -ex; \
|
||||
apt-get update; \
|
||||
apt-get install -y --no-install-recommends \
|
||||
gnupg \
|
||||
; \
|
||||
rm -rf /var/lib/apt/lists/*
|
||||
|
||||
# grab gosu for easy step-down from root
|
||||
# https://github.com/tianon/gosu/releases
|
||||
ENV GOSU_VERSION 1.16
|
||||
@ -81,7 +78,7 @@ RUN set -ex; \
|
||||
mkdir -p /usr/local/share/keyrings/; \
|
||||
gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "$key"; \
|
||||
gpg --batch --export --armor "$key" > /usr/local/share/keyrings/postgres.gpg.asc; \
|
||||
command -v gpgconf > /dev/null && gpgconf --kill all; \
|
||||
gpgconf --kill all; \
|
||||
rm -rf "$GNUPGHOME"
|
||||
|
||||
ENV PG_MAJOR 14
|
||||
|
||||
19
15/bullseye/Dockerfile
generated
19
15/bullseye/Dockerfile
generated
@ -6,16 +6,6 @@
|
||||
|
||||
FROM debian:bullseye-slim
|
||||
|
||||
RUN set -ex; \
|
||||
if ! command -v gpg > /dev/null; then \
|
||||
apt-get update; \
|
||||
apt-get install -y --no-install-recommends \
|
||||
gnupg \
|
||||
dirmngr \
|
||||
; \
|
||||
rm -rf /var/lib/apt/lists/*; \
|
||||
fi
|
||||
|
||||
# explicitly set user/group IDs
|
||||
RUN set -eux; \
|
||||
groupadd -r postgres --gid=999; \
|
||||
@ -26,6 +16,13 @@ RUN set -eux; \
|
||||
mkdir -p /var/lib/postgresql; \
|
||||
chown -R postgres:postgres /var/lib/postgresql
|
||||
|
||||
RUN set -ex; \
|
||||
apt-get update; \
|
||||
apt-get install -y --no-install-recommends \
|
||||
gnupg \
|
||||
; \
|
||||
rm -rf /var/lib/apt/lists/*
|
||||
|
||||
# grab gosu for easy step-down from root
|
||||
# https://github.com/tianon/gosu/releases
|
||||
ENV GOSU_VERSION 1.16
|
||||
@ -81,7 +78,7 @@ RUN set -ex; \
|
||||
mkdir -p /usr/local/share/keyrings/; \
|
||||
gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "$key"; \
|
||||
gpg --batch --export --armor "$key" > /usr/local/share/keyrings/postgres.gpg.asc; \
|
||||
command -v gpgconf > /dev/null && gpgconf --kill all; \
|
||||
gpgconf --kill all; \
|
||||
rm -rf "$GNUPGHOME"
|
||||
|
||||
ENV PG_MAJOR 15
|
||||
|
||||
@ -1,15 +1,5 @@
|
||||
FROM debian:{{ env.variant }}-slim
|
||||
|
||||
RUN set -ex; \
|
||||
if ! command -v gpg > /dev/null; then \
|
||||
apt-get update; \
|
||||
apt-get install -y --no-install-recommends \
|
||||
gnupg \
|
||||
dirmngr \
|
||||
; \
|
||||
rm -rf /var/lib/apt/lists/*; \
|
||||
fi
|
||||
|
||||
# explicitly set user/group IDs
|
||||
RUN set -eux; \
|
||||
groupadd -r postgres --gid=999; \
|
||||
@ -20,6 +10,13 @@ RUN set -eux; \
|
||||
mkdir -p /var/lib/postgresql; \
|
||||
chown -R postgres:postgres /var/lib/postgresql
|
||||
|
||||
RUN set -ex; \
|
||||
apt-get update; \
|
||||
apt-get install -y --no-install-recommends \
|
||||
gnupg \
|
||||
; \
|
||||
rm -rf /var/lib/apt/lists/*
|
||||
|
||||
# grab gosu for easy step-down from root
|
||||
# https://github.com/tianon/gosu/releases
|
||||
ENV GOSU_VERSION 1.16
|
||||
@ -75,7 +72,7 @@ RUN set -ex; \
|
||||
mkdir -p /usr/local/share/keyrings/; \
|
||||
gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "$key"; \
|
||||
gpg --batch --export --armor "$key" > /usr/local/share/keyrings/postgres.gpg.asc; \
|
||||
command -v gpgconf > /dev/null && gpgconf --kill all; \
|
||||
gpgconf --kill all; \
|
||||
rm -rf "$GNUPGHOME"
|
||||
|
||||
ENV PG_MAJOR {{ env.version }}
|
||||
|
||||
Reference in New Issue
Block a user