From 12b19f6d340af55d45754d420ec3a55a85f2e384 Mon Sep 17 00:00:00 2001 From: Rocky Breslow Date: Fri, 6 Jul 2018 12:53:51 -0400 Subject: [PATCH] Fallback to IPv4 pool to fix keyserver receive failed --- 10/Dockerfile | 6 ++++-- 11/Dockerfile | 6 ++++-- 9.3/Dockerfile | 6 ++++-- 9.4/Dockerfile | 6 ++++-- 9.5/Dockerfile | 6 ++++-- 9.6/Dockerfile | 6 ++++-- Dockerfile-debian.template | 6 ++++-- 7 files changed, 28 insertions(+), 14 deletions(-) diff --git a/10/Dockerfile b/10/Dockerfile index a7624394d2..e5601d1650 100644 --- a/10/Dockerfile +++ b/10/Dockerfile @@ -21,7 +21,8 @@ RUN set -x \ && wget -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$(dpkg --print-architecture)" \ && wget -O /usr/local/bin/gosu.asc "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$(dpkg --print-architecture).asc" \ && export GNUPGHOME="$(mktemp -d)" \ - && gpg --keyserver ha.pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ + && (gpg --keyserver ha.pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ + || gpg --keyserver ipv4.pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4) \ && gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu \ && rm -rf "$GNUPGHOME" /usr/local/bin/gosu.asc \ && chmod +x /usr/local/bin/gosu \ @@ -56,7 +57,8 @@ RUN set -ex; \ # uid PostgreSQL Debian Repository key='B97B0AFCAA1A47F044F244A07FCC7D46ACCC4CF8'; \ export GNUPGHOME="$(mktemp -d)"; \ - gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \ + (gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key" \ + || gpg --keyserver ipv4.pool.sks-keyservers.net --recv-keys "$key"); \ gpg --export "$key" > /etc/apt/trusted.gpg.d/postgres.gpg; \ rm -rf "$GNUPGHOME"; \ apt-key list diff --git a/11/Dockerfile b/11/Dockerfile index d8e3ce2d7c..eea0603098 100644 --- a/11/Dockerfile +++ b/11/Dockerfile @@ -21,7 +21,8 @@ RUN set -x \ && wget -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$(dpkg --print-architecture)" \ && wget -O /usr/local/bin/gosu.asc "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$(dpkg --print-architecture).asc" \ && export GNUPGHOME="$(mktemp -d)" \ - && gpg --keyserver ha.pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ + && (gpg --keyserver ha.pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ + || gpg --keyserver ipv4.pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4) \ && gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu \ && rm -rf "$GNUPGHOME" /usr/local/bin/gosu.asc \ && chmod +x /usr/local/bin/gosu \ @@ -56,7 +57,8 @@ RUN set -ex; \ # uid PostgreSQL Debian Repository key='B97B0AFCAA1A47F044F244A07FCC7D46ACCC4CF8'; \ export GNUPGHOME="$(mktemp -d)"; \ - gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \ + (gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key" \ + || gpg --keyserver ipv4.pool.sks-keyservers.net --recv-keys "$key"); \ gpg --export "$key" > /etc/apt/trusted.gpg.d/postgres.gpg; \ rm -rf "$GNUPGHOME"; \ apt-key list diff --git a/9.3/Dockerfile b/9.3/Dockerfile index b716d3cfa4..351ae78bf7 100644 --- a/9.3/Dockerfile +++ b/9.3/Dockerfile @@ -21,7 +21,8 @@ RUN set -x \ && wget -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$(dpkg --print-architecture)" \ && wget -O /usr/local/bin/gosu.asc "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$(dpkg --print-architecture).asc" \ && export GNUPGHOME="$(mktemp -d)" \ - && gpg --keyserver ha.pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ + && (gpg --keyserver ha.pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ + || gpg --keyserver ipv4.pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4) \ && gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu \ && rm -rf "$GNUPGHOME" /usr/local/bin/gosu.asc \ && chmod +x /usr/local/bin/gosu \ @@ -56,7 +57,8 @@ RUN set -ex; \ # uid PostgreSQL Debian Repository key='B97B0AFCAA1A47F044F244A07FCC7D46ACCC4CF8'; \ export GNUPGHOME="$(mktemp -d)"; \ - gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \ + (gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key" \ + || gpg --keyserver ipv4.pool.sks-keyservers.net --recv-keys "$key"); \ gpg --export "$key" > /etc/apt/trusted.gpg.d/postgres.gpg; \ rm -rf "$GNUPGHOME"; \ apt-key list diff --git a/9.4/Dockerfile b/9.4/Dockerfile index d4056fec8c..09467222b5 100644 --- a/9.4/Dockerfile +++ b/9.4/Dockerfile @@ -21,7 +21,8 @@ RUN set -x \ && wget -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$(dpkg --print-architecture)" \ && wget -O /usr/local/bin/gosu.asc "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$(dpkg --print-architecture).asc" \ && export GNUPGHOME="$(mktemp -d)" \ - && gpg --keyserver ha.pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ + && (gpg --keyserver ha.pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ + || gpg --keyserver ipv4.pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4) \ && gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu \ && rm -rf "$GNUPGHOME" /usr/local/bin/gosu.asc \ && chmod +x /usr/local/bin/gosu \ @@ -56,7 +57,8 @@ RUN set -ex; \ # uid PostgreSQL Debian Repository key='B97B0AFCAA1A47F044F244A07FCC7D46ACCC4CF8'; \ export GNUPGHOME="$(mktemp -d)"; \ - gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \ + (gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key" \ + || gpg --keyserver ipv4.pool.sks-keyservers.net --recv-keys "$key"); \ gpg --export "$key" > /etc/apt/trusted.gpg.d/postgres.gpg; \ rm -rf "$GNUPGHOME"; \ apt-key list diff --git a/9.5/Dockerfile b/9.5/Dockerfile index 451d014578..b2c82c859d 100644 --- a/9.5/Dockerfile +++ b/9.5/Dockerfile @@ -21,7 +21,8 @@ RUN set -x \ && wget -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$(dpkg --print-architecture)" \ && wget -O /usr/local/bin/gosu.asc "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$(dpkg --print-architecture).asc" \ && export GNUPGHOME="$(mktemp -d)" \ - && gpg --keyserver ha.pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ + && (gpg --keyserver ha.pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ + || gpg --keyserver ipv4.pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4) \ && gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu \ && rm -rf "$GNUPGHOME" /usr/local/bin/gosu.asc \ && chmod +x /usr/local/bin/gosu \ @@ -56,7 +57,8 @@ RUN set -ex; \ # uid PostgreSQL Debian Repository key='B97B0AFCAA1A47F044F244A07FCC7D46ACCC4CF8'; \ export GNUPGHOME="$(mktemp -d)"; \ - gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \ + (gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key" \ + || gpg --keyserver ipv4.pool.sks-keyservers.net --recv-keys "$key"); \ gpg --export "$key" > /etc/apt/trusted.gpg.d/postgres.gpg; \ rm -rf "$GNUPGHOME"; \ apt-key list diff --git a/9.6/Dockerfile b/9.6/Dockerfile index 77907dbe45..67f126120e 100644 --- a/9.6/Dockerfile +++ b/9.6/Dockerfile @@ -21,7 +21,8 @@ RUN set -x \ && wget -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$(dpkg --print-architecture)" \ && wget -O /usr/local/bin/gosu.asc "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$(dpkg --print-architecture).asc" \ && export GNUPGHOME="$(mktemp -d)" \ - && gpg --keyserver ha.pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ + && (gpg --keyserver ha.pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ + || gpg --keyserver ipv4.pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4) \ && gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu \ && rm -rf "$GNUPGHOME" /usr/local/bin/gosu.asc \ && chmod +x /usr/local/bin/gosu \ @@ -56,7 +57,8 @@ RUN set -ex; \ # uid PostgreSQL Debian Repository key='B97B0AFCAA1A47F044F244A07FCC7D46ACCC4CF8'; \ export GNUPGHOME="$(mktemp -d)"; \ - gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \ + (gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key" \ + || gpg --keyserver ipv4.pool.sks-keyservers.net --recv-keys "$key"); \ gpg --export "$key" > /etc/apt/trusted.gpg.d/postgres.gpg; \ rm -rf "$GNUPGHOME"; \ apt-key list diff --git a/Dockerfile-debian.template b/Dockerfile-debian.template index 715d968bf3..2a2329bcfd 100644 --- a/Dockerfile-debian.template +++ b/Dockerfile-debian.template @@ -21,7 +21,8 @@ RUN set -x \ && wget -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$(dpkg --print-architecture)" \ && wget -O /usr/local/bin/gosu.asc "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$(dpkg --print-architecture).asc" \ && export GNUPGHOME="$(mktemp -d)" \ - && gpg --keyserver ha.pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ + && (gpg --keyserver ha.pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ + || gpg --keyserver ipv4.pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4) \ && gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu \ && rm -rf "$GNUPGHOME" /usr/local/bin/gosu.asc \ && chmod +x /usr/local/bin/gosu \ @@ -56,7 +57,8 @@ RUN set -ex; \ # uid PostgreSQL Debian Repository key='B97B0AFCAA1A47F044F244A07FCC7D46ACCC4CF8'; \ export GNUPGHOME="$(mktemp -d)"; \ - gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \ + (gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key" \ + || gpg --keyserver ipv4.pool.sks-keyservers.net --recv-keys "$key"); \ gpg --export "$key" > /etc/apt/trusted.gpg.d/postgres.gpg; \ rm -rf "$GNUPGHOME"; \ apt-key list