From ea6f466b258ad42a87a753a10dc84272d56ab699 Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Tue, 10 Jan 2017 15:40:05 -0800 Subject: [PATCH] Use "/etc/apt/trusted.gpg.d" instead of "apt-key adv" > Note: Instead of using this command a keyring should be placed > directly in the /etc/apt/trusted.gpg.d/ directory with a > descriptive name and either "gpg" or "asc" as file extension. https://manpages.debian.org/cgi-bin/man.cgi?query=apt-key&manpath=Debian+testing+stretch --- 9.2/Dockerfile | 11 ++++++++++- 9.3/Dockerfile | 11 ++++++++++- 9.4/Dockerfile | 11 ++++++++++- 9.5/Dockerfile | 11 ++++++++++- 9.6/Dockerfile | 11 ++++++++++- Dockerfile-debian.template | 11 ++++++++++- 6 files changed, 60 insertions(+), 6 deletions(-) diff --git a/9.2/Dockerfile b/9.2/Dockerfile index b5b1c93a0a..91c2b7f2e5 100644 --- a/9.2/Dockerfile +++ b/9.2/Dockerfile @@ -25,7 +25,16 @@ ENV LANG en_US.utf8 RUN mkdir /docker-entrypoint-initdb.d -RUN apt-key adv --keyserver ha.pool.sks-keyservers.net --recv-keys B97B0AFCAA1A47F044F244A07FCC7D46ACCC4CF8 +RUN set -ex; \ +# pub 4096R/ACCC4CF8 2011-10-13 [expires: 2019-07-02] +# Key fingerprint = B97B 0AFC AA1A 47F0 44F2 44A0 7FCC 7D46 ACCC 4CF8 +# uid PostgreSQL Debian Repository + key='B97B0AFCAA1A47F044F244A07FCC7D46ACCC4CF8'; \ + export GNUPGHOME="$(mktemp -d)"; \ + gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \ + gpg --export "$key" > /etc/apt/trusted.gpg.d/postgres.gpg; \ + rm -r "$GNUPGHOME"; \ + apt-key list ENV PG_MAJOR 9.2 ENV PG_VERSION 9.2.19-1.pgdg80+1 diff --git a/9.3/Dockerfile b/9.3/Dockerfile index 46ad744790..c86505a84a 100644 --- a/9.3/Dockerfile +++ b/9.3/Dockerfile @@ -25,7 +25,16 @@ ENV LANG en_US.utf8 RUN mkdir /docker-entrypoint-initdb.d -RUN apt-key adv --keyserver ha.pool.sks-keyservers.net --recv-keys B97B0AFCAA1A47F044F244A07FCC7D46ACCC4CF8 +RUN set -ex; \ +# pub 4096R/ACCC4CF8 2011-10-13 [expires: 2019-07-02] +# Key fingerprint = B97B 0AFC AA1A 47F0 44F2 44A0 7FCC 7D46 ACCC 4CF8 +# uid PostgreSQL Debian Repository + key='B97B0AFCAA1A47F044F244A07FCC7D46ACCC4CF8'; \ + export GNUPGHOME="$(mktemp -d)"; \ + gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \ + gpg --export "$key" > /etc/apt/trusted.gpg.d/postgres.gpg; \ + rm -r "$GNUPGHOME"; \ + apt-key list ENV PG_MAJOR 9.3 ENV PG_VERSION 9.3.15-1.pgdg80+1 diff --git a/9.4/Dockerfile b/9.4/Dockerfile index 62d85c9548..a88e070fc5 100644 --- a/9.4/Dockerfile +++ b/9.4/Dockerfile @@ -25,7 +25,16 @@ ENV LANG en_US.utf8 RUN mkdir /docker-entrypoint-initdb.d -RUN apt-key adv --keyserver ha.pool.sks-keyservers.net --recv-keys B97B0AFCAA1A47F044F244A07FCC7D46ACCC4CF8 +RUN set -ex; \ +# pub 4096R/ACCC4CF8 2011-10-13 [expires: 2019-07-02] +# Key fingerprint = B97B 0AFC AA1A 47F0 44F2 44A0 7FCC 7D46 ACCC 4CF8 +# uid PostgreSQL Debian Repository + key='B97B0AFCAA1A47F044F244A07FCC7D46ACCC4CF8'; \ + export GNUPGHOME="$(mktemp -d)"; \ + gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \ + gpg --export "$key" > /etc/apt/trusted.gpg.d/postgres.gpg; \ + rm -r "$GNUPGHOME"; \ + apt-key list ENV PG_MAJOR 9.4 ENV PG_VERSION 9.4.10-1.pgdg80+1 diff --git a/9.5/Dockerfile b/9.5/Dockerfile index c9c0a283ca..3c83e392c9 100644 --- a/9.5/Dockerfile +++ b/9.5/Dockerfile @@ -25,7 +25,16 @@ ENV LANG en_US.utf8 RUN mkdir /docker-entrypoint-initdb.d -RUN apt-key adv --keyserver ha.pool.sks-keyservers.net --recv-keys B97B0AFCAA1A47F044F244A07FCC7D46ACCC4CF8 +RUN set -ex; \ +# pub 4096R/ACCC4CF8 2011-10-13 [expires: 2019-07-02] +# Key fingerprint = B97B 0AFC AA1A 47F0 44F2 44A0 7FCC 7D46 ACCC 4CF8 +# uid PostgreSQL Debian Repository + key='B97B0AFCAA1A47F044F244A07FCC7D46ACCC4CF8'; \ + export GNUPGHOME="$(mktemp -d)"; \ + gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \ + gpg --export "$key" > /etc/apt/trusted.gpg.d/postgres.gpg; \ + rm -r "$GNUPGHOME"; \ + apt-key list ENV PG_MAJOR 9.5 ENV PG_VERSION 9.5.5-1.pgdg80+1 diff --git a/9.6/Dockerfile b/9.6/Dockerfile index 7a9169a0f8..f64bb5e617 100644 --- a/9.6/Dockerfile +++ b/9.6/Dockerfile @@ -25,7 +25,16 @@ ENV LANG en_US.utf8 RUN mkdir /docker-entrypoint-initdb.d -RUN apt-key adv --keyserver ha.pool.sks-keyservers.net --recv-keys B97B0AFCAA1A47F044F244A07FCC7D46ACCC4CF8 +RUN set -ex; \ +# pub 4096R/ACCC4CF8 2011-10-13 [expires: 2019-07-02] +# Key fingerprint = B97B 0AFC AA1A 47F0 44F2 44A0 7FCC 7D46 ACCC 4CF8 +# uid PostgreSQL Debian Repository + key='B97B0AFCAA1A47F044F244A07FCC7D46ACCC4CF8'; \ + export GNUPGHOME="$(mktemp -d)"; \ + gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \ + gpg --export "$key" > /etc/apt/trusted.gpg.d/postgres.gpg; \ + rm -r "$GNUPGHOME"; \ + apt-key list ENV PG_MAJOR 9.6 ENV PG_VERSION 9.6.1-2.pgdg80+1 diff --git a/Dockerfile-debian.template b/Dockerfile-debian.template index 83eb859b98..8012b4f7b3 100644 --- a/Dockerfile-debian.template +++ b/Dockerfile-debian.template @@ -25,7 +25,16 @@ ENV LANG en_US.utf8 RUN mkdir /docker-entrypoint-initdb.d -RUN apt-key adv --keyserver ha.pool.sks-keyservers.net --recv-keys B97B0AFCAA1A47F044F244A07FCC7D46ACCC4CF8 +RUN set -ex; \ +# pub 4096R/ACCC4CF8 2011-10-13 [expires: 2019-07-02] +# Key fingerprint = B97B 0AFC AA1A 47F0 44F2 44A0 7FCC 7D46 ACCC 4CF8 +# uid PostgreSQL Debian Repository + key='B97B0AFCAA1A47F044F244A07FCC7D46ACCC4CF8'; \ + export GNUPGHOME="$(mktemp -d)"; \ + gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \ + gpg --export "$key" > /etc/apt/trusted.gpg.d/postgres.gpg; \ + rm -r "$GNUPGHOME"; \ + apt-key list ENV PG_MAJOR %%PG_MAJOR%% ENV PG_VERSION %%PG_VERSION%%