From c509a3a345f05135cd6587d54b3da90a12c494a9 Mon Sep 17 00:00:00 2001 From: Chernoskutov Pavel Date: Mon, 22 Apr 2019 10:18:39 +0500 Subject: [PATCH] Try fix gpg error --- 10/Dockerfile | 7 ++++--- 11/Dockerfile | 7 ++++--- 9.5/Dockerfile | 7 ++++--- 9.6/Dockerfile | 7 ++++--- Dockerfile.template | 8 +++++--- 5 files changed, 21 insertions(+), 15 deletions(-) diff --git a/10/Dockerfile b/10/Dockerfile index 7114767..e6e213c 100644 --- a/10/Dockerfile +++ b/10/Dockerfile @@ -24,10 +24,11 @@ RUN set -x \ && apt-get install -y --no-install-recommends ca-certificates wget gnupg dirmngr lsb-release \ && rm -rf /var/lib/apt/lists/* \ && 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)" \ + && wget -O /usr/local/bin/gosu.asc "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$(dpkg --print-architecture).asc" + +RUN export GNUPGHOME="$(mktemp -d)" \ && mkdir ~/.gnupg && echo "disable-ipv6" >> ~/.gnupg/dirmngr.conf \ - && (gpg --no-tty --keyserver ha.pool.sks-keyservers.net --recv-keys $GPG_KEY \ + && (gpg --no-tty --keyserver ipv4.pool.sks-keyservers.net --recv-keys $GPG_KEY \ || gpg --no-tty --keyserver pgp.mit.edu --recv-keys $GPG_KEY \ || gpg --no-tty --keyserver keyserver.pgp.com --recv-keys $GPG_KEY) \ && gpg --no-tty --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu \ diff --git a/11/Dockerfile b/11/Dockerfile index 45939da..f381eb0 100644 --- a/11/Dockerfile +++ b/11/Dockerfile @@ -24,10 +24,11 @@ RUN set -x \ && apt-get install -y --no-install-recommends ca-certificates wget gnupg dirmngr lsb-release \ && rm -rf /var/lib/apt/lists/* \ && 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)" \ + && wget -O /usr/local/bin/gosu.asc "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$(dpkg --print-architecture).asc" + +RUN export GNUPGHOME="$(mktemp -d)" \ && mkdir ~/.gnupg && echo "disable-ipv6" >> ~/.gnupg/dirmngr.conf \ - && (gpg --no-tty --keyserver ha.pool.sks-keyservers.net --recv-keys $GPG_KEY \ + && (gpg --no-tty --keyserver ipv4.pool.sks-keyservers.net --recv-keys $GPG_KEY \ || gpg --no-tty --keyserver pgp.mit.edu --recv-keys $GPG_KEY \ || gpg --no-tty --keyserver keyserver.pgp.com --recv-keys $GPG_KEY) \ && gpg --no-tty --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu \ diff --git a/9.5/Dockerfile b/9.5/Dockerfile index b4eacea..e922999 100644 --- a/9.5/Dockerfile +++ b/9.5/Dockerfile @@ -24,10 +24,11 @@ RUN set -x \ && apt-get install -y --no-install-recommends ca-certificates wget gnupg dirmngr lsb-release \ && rm -rf /var/lib/apt/lists/* \ && 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)" \ + && wget -O /usr/local/bin/gosu.asc "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$(dpkg --print-architecture).asc" + +RUN export GNUPGHOME="$(mktemp -d)" \ && mkdir ~/.gnupg && echo "disable-ipv6" >> ~/.gnupg/dirmngr.conf \ - && (gpg --no-tty --keyserver ha.pool.sks-keyservers.net --recv-keys $GPG_KEY \ + && (gpg --no-tty --keyserver ipv4.pool.sks-keyservers.net --recv-keys $GPG_KEY \ || gpg --no-tty --keyserver pgp.mit.edu --recv-keys $GPG_KEY \ || gpg --no-tty --keyserver keyserver.pgp.com --recv-keys $GPG_KEY) \ && gpg --no-tty --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu \ diff --git a/9.6/Dockerfile b/9.6/Dockerfile index 2cf8e07..f7c1eb3 100644 --- a/9.6/Dockerfile +++ b/9.6/Dockerfile @@ -24,10 +24,11 @@ RUN set -x \ && apt-get install -y --no-install-recommends ca-certificates wget gnupg dirmngr lsb-release \ && rm -rf /var/lib/apt/lists/* \ && 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)" \ + && wget -O /usr/local/bin/gosu.asc "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$(dpkg --print-architecture).asc" + +RUN export GNUPGHOME="$(mktemp -d)" \ && mkdir ~/.gnupg && echo "disable-ipv6" >> ~/.gnupg/dirmngr.conf \ - && (gpg --no-tty --keyserver ha.pool.sks-keyservers.net --recv-keys $GPG_KEY \ + && (gpg --no-tty --keyserver ipv4.pool.sks-keyservers.net --recv-keys $GPG_KEY \ || gpg --no-tty --keyserver pgp.mit.edu --recv-keys $GPG_KEY \ || gpg --no-tty --keyserver keyserver.pgp.com --recv-keys $GPG_KEY) \ && gpg --no-tty --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu \ diff --git a/Dockerfile.template b/Dockerfile.template index 26504e3..9f8f66d 100644 --- a/Dockerfile.template +++ b/Dockerfile.template @@ -24,9 +24,11 @@ RUN set -x \ && apt-get install -y --no-install-recommends ca-certificates wget gnupg dirmngr lsb-release \ && rm -rf /var/lib/apt/lists/* \ && 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 $GPG_KEY \ + && wget -O /usr/local/bin/gosu.asc "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$(dpkg --print-architecture).asc" + +RUN export GNUPGHOME="$(mktemp -d)" \ + && mkdir ~/.gnupg && echo "disable-ipv6" >> ~/.gnupg/dirmngr.conf \ + && (gpg --no-tty --keyserver ipv4.pool.sks-keyservers.net --recv-keys $GPG_KEY \ || gpg --keyserver pgp.mit.edu --recv-keys $GPG_KEY \ || gpg --keyserver keyserver.pgp.com --recv-keys $GPG_KEY) \ && gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu \