From ab99d2341c798c04629ef284fc7265c9fc465723 Mon Sep 17 00:00:00 2001 From: Philipp Date: Mon, 15 Jun 2020 16:06:08 +0200 Subject: [PATCH] Disable IPv6 for gpg check --- 2020.03/apache/Dockerfile | 2 ++ 2020.03/fpm/Dockerfile | 2 ++ 2020.06-dev/apache/Dockerfile | 2 ++ 2020.06-dev/fpm/Dockerfile | 2 ++ 2020.06-rc/apache/Dockerfile | 2 ++ 2020.06-rc/fpm/Dockerfile | 2 ++ Dockerfile-debian.template | 2 ++ 7 files changed, 14 insertions(+) diff --git a/2020.03/apache/Dockerfile b/2020.03/apache/Dockerfile index 8ae1176..41fe1ff 100644 --- a/2020.03/apache/Dockerfile +++ b/2020.03/apache/Dockerfile @@ -19,6 +19,8 @@ RUN set -ex; \ # Add tini for reaping processes ENV TINI_VERSION v0.19.0 RUN export BUILD_ARCH=$(dpkg-architecture --query DEB_BUILD_ARCH) \ + && mkdir ~/.gnupg + && echo "disable-ipv6" >> ~/.gnupg/dirmngr.conf && curl -L -o /sbin/tini https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini-${BUILD_ARCH} \ && curl -L -o /tini.asc https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini-${BUILD_ARCH}.asc \ && gpg --batch --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 595E85A6B1B4779EA4DAAEC70B588DFF0527A9B7 \ diff --git a/2020.03/fpm/Dockerfile b/2020.03/fpm/Dockerfile index ce8d10e..785278f 100644 --- a/2020.03/fpm/Dockerfile +++ b/2020.03/fpm/Dockerfile @@ -19,6 +19,8 @@ RUN set -ex; \ # Add tini for reaping processes ENV TINI_VERSION v0.19.0 RUN export BUILD_ARCH=$(dpkg-architecture --query DEB_BUILD_ARCH) \ + && mkdir ~/.gnupg + && echo "disable-ipv6" >> ~/.gnupg/dirmngr.conf && curl -L -o /sbin/tini https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini-${BUILD_ARCH} \ && curl -L -o /tini.asc https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini-${BUILD_ARCH}.asc \ && gpg --batch --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 595E85A6B1B4779EA4DAAEC70B588DFF0527A9B7 \ diff --git a/2020.06-dev/apache/Dockerfile b/2020.06-dev/apache/Dockerfile index bb68a79..9119d54 100644 --- a/2020.06-dev/apache/Dockerfile +++ b/2020.06-dev/apache/Dockerfile @@ -19,6 +19,8 @@ RUN set -ex; \ # Add tini for reaping processes ENV TINI_VERSION v0.19.0 RUN export BUILD_ARCH=$(dpkg-architecture --query DEB_BUILD_ARCH) \ + && mkdir ~/.gnupg + && echo "disable-ipv6" >> ~/.gnupg/dirmngr.conf && curl -L -o /sbin/tini https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini-${BUILD_ARCH} \ && curl -L -o /tini.asc https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini-${BUILD_ARCH}.asc \ && gpg --batch --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 595E85A6B1B4779EA4DAAEC70B588DFF0527A9B7 \ diff --git a/2020.06-dev/fpm/Dockerfile b/2020.06-dev/fpm/Dockerfile index 45ef9c2..7f7dbc3 100644 --- a/2020.06-dev/fpm/Dockerfile +++ b/2020.06-dev/fpm/Dockerfile @@ -19,6 +19,8 @@ RUN set -ex; \ # Add tini for reaping processes ENV TINI_VERSION v0.19.0 RUN export BUILD_ARCH=$(dpkg-architecture --query DEB_BUILD_ARCH) \ + && mkdir ~/.gnupg + && echo "disable-ipv6" >> ~/.gnupg/dirmngr.conf && curl -L -o /sbin/tini https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini-${BUILD_ARCH} \ && curl -L -o /tini.asc https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini-${BUILD_ARCH}.asc \ && gpg --batch --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 595E85A6B1B4779EA4DAAEC70B588DFF0527A9B7 \ diff --git a/2020.06-rc/apache/Dockerfile b/2020.06-rc/apache/Dockerfile index de63aec..b3deb72 100644 --- a/2020.06-rc/apache/Dockerfile +++ b/2020.06-rc/apache/Dockerfile @@ -19,6 +19,8 @@ RUN set -ex; \ # Add tini for reaping processes ENV TINI_VERSION v0.19.0 RUN export BUILD_ARCH=$(dpkg-architecture --query DEB_BUILD_ARCH) \ + && mkdir ~/.gnupg + && echo "disable-ipv6" >> ~/.gnupg/dirmngr.conf && curl -L -o /sbin/tini https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini-${BUILD_ARCH} \ && curl -L -o /tini.asc https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini-${BUILD_ARCH}.asc \ && gpg --batch --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 595E85A6B1B4779EA4DAAEC70B588DFF0527A9B7 \ diff --git a/2020.06-rc/fpm/Dockerfile b/2020.06-rc/fpm/Dockerfile index c4fc7b8..3d220b7 100644 --- a/2020.06-rc/fpm/Dockerfile +++ b/2020.06-rc/fpm/Dockerfile @@ -19,6 +19,8 @@ RUN set -ex; \ # Add tini for reaping processes ENV TINI_VERSION v0.19.0 RUN export BUILD_ARCH=$(dpkg-architecture --query DEB_BUILD_ARCH) \ + && mkdir ~/.gnupg + && echo "disable-ipv6" >> ~/.gnupg/dirmngr.conf && curl -L -o /sbin/tini https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini-${BUILD_ARCH} \ && curl -L -o /tini.asc https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini-${BUILD_ARCH}.asc \ && gpg --batch --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 595E85A6B1B4779EA4DAAEC70B588DFF0527A9B7 \ diff --git a/Dockerfile-debian.template b/Dockerfile-debian.template index 1410bb3..6308b20 100644 --- a/Dockerfile-debian.template +++ b/Dockerfile-debian.template @@ -18,6 +18,8 @@ RUN set -ex; \ # Add tini for reaping processes ENV TINI_VERSION v%%TINI_VERSION%% RUN export BUILD_ARCH=$(dpkg-architecture --query DEB_BUILD_ARCH) \ + && mkdir ~/.gnupg + && echo "disable-ipv6" >> ~/.gnupg/dirmngr.conf && curl -L -o /sbin/tini https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini-${BUILD_ARCH} \ && curl -L -o /tini.asc https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini-${BUILD_ARCH}.asc \ && gpg --batch --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 595E85A6B1B4779EA4DAAEC70B588DFF0527A9B7 \