Skip to content

Commit 8cd285c

Browse files
author
Herwig bogaert
committed
Honour http_proxy env variable when fetching gpg keys
http_proxy can be defined as build argument when building the container behind a proxy. Since version 2.1 of GnuPG, dirmngr takes care of accessing keyservers, but dirnmgr does not honor http_proxy unless it is configured to do so.
1 parent 662b2e6 commit 8cd285c

File tree

7 files changed

+21
-7
lines changed

7 files changed

+21
-7
lines changed

‎10/Dockerfile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,8 @@ RUN set -x \
2828
&& wget -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$(dpkg --print-architecture)" \
2929
&& wget -O /usr/local/bin/gosu.asc "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$(dpkg --print-architecture).asc" \
3030
&& export GNUPGHOME="$(mktemp -d)" \
31-
&& gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \
31+
&& echo 'honor-http-proxy' >$GNUPGHOME/dirmngr.conf \
32+
&& gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \
3233
&& gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu \
3334
&& { command -v gpgconf > /dev/null && gpgconf --kill all || :; } \
3435
&& rm -rf "$GNUPGHOME" /usr/local/bin/gosu.asc \
@@ -64,6 +65,7 @@ RUN set -ex; \
6465
# uid PostgreSQL Debian Repository
6566
key='B97B0AFCAA1A47F044F244A07FCC7D46ACCC4CF8'; \
6667
export GNUPGHOME="$(mktemp -d)"; \
68+
echo 'honor-http-proxy' >$GNUPGHOME/dirmngr.conf; \
6769
gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
6870
gpg --batch --export "$key" > /etc/apt/trusted.gpg.d/postgres.gpg; \
6971
command -v gpgconf > /dev/null && gpgconf --kill all; \

‎11/Dockerfile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,8 @@ RUN set -x \
2828
&& wget -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$(dpkg --print-architecture)" \
2929
&& wget -O /usr/local/bin/gosu.asc "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$(dpkg --print-architecture).asc" \
3030
&& export GNUPGHOME="$(mktemp -d)" \
31-
&& gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \
31+
&& echo 'honor-http-proxy' >$GNUPGHOME/dirmngr.conf \
32+
&& gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \
3233
&& gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu \
3334
&& { command -v gpgconf > /dev/null && gpgconf --kill all || :; } \
3435
&& rm -rf "$GNUPGHOME" /usr/local/bin/gosu.asc \
@@ -64,6 +65,7 @@ RUN set -ex; \
6465
# uid PostgreSQL Debian Repository
6566
key='B97B0AFCAA1A47F044F244A07FCC7D46ACCC4CF8'; \
6667
export GNUPGHOME="$(mktemp -d)"; \
68+
echo 'honor-http-proxy' >$GNUPGHOME/dirmngr.conf; \
6769
gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
6870
gpg --batch --export "$key" > /etc/apt/trusted.gpg.d/postgres.gpg; \
6971
command -v gpgconf > /dev/null && gpgconf --kill all; \

‎12/Dockerfile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,8 @@ RUN set -x \
2828
&& wget -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$(dpkg --print-architecture)" \
2929
&& wget -O /usr/local/bin/gosu.asc "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$(dpkg --print-architecture).asc" \
3030
&& export GNUPGHOME="$(mktemp -d)" \
31-
&& gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \
31+
&& echo 'honor-http-proxy' >$GNUPGHOME/dirmngr.conf \
32+
&& gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \
3233
&& gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu \
3334
&& { command -v gpgconf > /dev/null && gpgconf --kill all || :; } \
3435
&& rm -rf "$GNUPGHOME" /usr/local/bin/gosu.asc \
@@ -64,6 +65,7 @@ RUN set -ex; \
6465
# uid PostgreSQL Debian Repository
6566
key='B97B0AFCAA1A47F044F244A07FCC7D46ACCC4CF8'; \
6667
export GNUPGHOME="$(mktemp -d)"; \
68+
echo 'honor-http-proxy' >$GNUPGHOME/dirmngr.conf; \
6769
gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
6870
gpg --batch --export "$key" > /etc/apt/trusted.gpg.d/postgres.gpg; \
6971
command -v gpgconf > /dev/null && gpgconf --kill all; \

‎9.4/Dockerfile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,8 @@ RUN set -x \
2828
&& wget -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$(dpkg --print-architecture)" \
2929
&& wget -O /usr/local/bin/gosu.asc "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$(dpkg --print-architecture).asc" \
3030
&& export GNUPGHOME="$(mktemp -d)" \
31-
&& gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \
31+
&& echo 'honor-http-proxy' >$GNUPGHOME/dirmngr.conf \
32+
&& gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \
3233
&& gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu \
3334
&& { command -v gpgconf > /dev/null && gpgconf --kill all || :; } \
3435
&& rm -rf "$GNUPGHOME" /usr/local/bin/gosu.asc \
@@ -64,6 +65,7 @@ RUN set -ex; \
6465
# uid PostgreSQL Debian Repository
6566
key='B97B0AFCAA1A47F044F244A07FCC7D46ACCC4CF8'; \
6667
export GNUPGHOME="$(mktemp -d)"; \
68+
echo 'honor-http-proxy' >$GNUPGHOME/dirmngr.conf; \
6769
gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
6870
gpg --batch --export "$key" > /etc/apt/trusted.gpg.d/postgres.gpg; \
6971
command -v gpgconf > /dev/null && gpgconf --kill all; \

‎9.5/Dockerfile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,8 @@ RUN set -x \
2828
&& wget -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$(dpkg --print-architecture)" \
2929
&& wget -O /usr/local/bin/gosu.asc "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$(dpkg --print-architecture).asc" \
3030
&& export GNUPGHOME="$(mktemp -d)" \
31-
&& gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \
31+
&& echo 'honor-http-proxy' >$GNUPGHOME/dirmngr.conf \
32+
&& gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \
3233
&& gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu \
3334
&& { command -v gpgconf > /dev/null && gpgconf --kill all || :; } \
3435
&& rm -rf "$GNUPGHOME" /usr/local/bin/gosu.asc \
@@ -64,6 +65,7 @@ RUN set -ex; \
6465
# uid PostgreSQL Debian Repository
6566
key='B97B0AFCAA1A47F044F244A07FCC7D46ACCC4CF8'; \
6667
export GNUPGHOME="$(mktemp -d)"; \
68+
echo 'honor-http-proxy' >$GNUPGHOME/dirmngr.conf; \
6769
gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
6870
gpg --batch --export "$key" > /etc/apt/trusted.gpg.d/postgres.gpg; \
6971
command -v gpgconf > /dev/null && gpgconf --kill all; \

‎9.6/Dockerfile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,8 @@ RUN set -x \
2828
&& wget -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$(dpkg --print-architecture)" \
2929
&& wget -O /usr/local/bin/gosu.asc "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$(dpkg --print-architecture).asc" \
3030
&& export GNUPGHOME="$(mktemp -d)" \
31-
&& gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \
31+
&& echo 'honor-http-proxy' >$GNUPGHOME/dirmngr.conf \
32+
&& gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \
3233
&& gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu \
3334
&& { command -v gpgconf > /dev/null && gpgconf --kill all || :; } \
3435
&& rm -rf "$GNUPGHOME" /usr/local/bin/gosu.asc \
@@ -64,6 +65,7 @@ RUN set -ex; \
6465
# uid PostgreSQL Debian Repository
6566
key='B97B0AFCAA1A47F044F244A07FCC7D46ACCC4CF8'; \
6667
export GNUPGHOME="$(mktemp -d)"; \
68+
echo 'honor-http-proxy' >$GNUPGHOME/dirmngr.conf; \
6769
gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
6870
gpg --batch --export "$key" > /etc/apt/trusted.gpg.d/postgres.gpg; \
6971
command -v gpgconf > /dev/null && gpgconf --kill all; \

‎Dockerfile-debian.template

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,8 @@ RUN set -x \
2828
&& wget -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$(dpkg --print-architecture)" \
2929
&& wget -O /usr/local/bin/gosu.asc "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$(dpkg --print-architecture).asc" \
3030
&& export GNUPGHOME="$(mktemp -d)" \
31-
&& gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \
31+
&& echo 'honor-http-proxy' >$GNUPGHOME/dirmngr.conf \
32+
&& gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \
3233
&& gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu \
3334
&& { command -v gpgconf > /dev/null && gpgconf --kill all || :; } \
3435
&& rm -rf "$GNUPGHOME" /usr/local/bin/gosu.asc \
@@ -64,6 +65,7 @@ RUN set -ex; \
6465
# uid PostgreSQL Debian Repository
6566
key='B97B0AFCAA1A47F044F244A07FCC7D46ACCC4CF8'; \
6667
export GNUPGHOME="$(mktemp -d)"; \
68+
echo 'honor-http-proxy' >$GNUPGHOME/dirmngr.conf; \
6769
gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
6870
gpg --batch --export "$key" > /etc/apt/trusted.gpg.d/postgres.gpg; \
6971
command -v gpgconf > /dev/null && gpgconf --kill all; \

0 commit comments

Comments
 (0)