Skip to content

Commit 73f9262

Browse files
yosifkityosifkit
authored
Merge pull request docker-library#527 from infosiftr/gpg-batch
Update "gpg" invocations to use "--batch"
2 parents 64bec4b + d61fd19 commit 73f9262

File tree

7 files changed

+21
-21
lines changed

7 files changed

+21
-21
lines changed

‎10/Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ 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 --keyserver ha.pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \
31+
&& gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \
3232
&& gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu \
3333
&& { command -v gpgconf > /dev/null && gpgconf --kill all || :; } \
3434
&& rm -rf "$GNUPGHOME" /usr/local/bin/gosu.asc \
@@ -64,8 +64,8 @@ RUN set -ex; \
6464
# uid PostgreSQL Debian Repository
6565
key='B97B0AFCAA1A47F044F244A07FCC7D46ACCC4CF8'; \
6666
export GNUPGHOME="$(mktemp -d)"; \
67-
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
68-
gpg --export "$key" > /etc/apt/trusted.gpg.d/postgres.gpg; \
67+
gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
68+
gpg --batch --export "$key" > /etc/apt/trusted.gpg.d/postgres.gpg; \
6969
command -v gpgconf > /dev/null && gpgconf --kill all; \
7070
rm -rf "$GNUPGHOME"; \
7171
apt-key list

‎11/Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ 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 --keyserver ha.pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \
31+
&& gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \
3232
&& gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu \
3333
&& { command -v gpgconf > /dev/null && gpgconf --kill all || :; } \
3434
&& rm -rf "$GNUPGHOME" /usr/local/bin/gosu.asc \
@@ -64,8 +64,8 @@ RUN set -ex; \
6464
# uid PostgreSQL Debian Repository
6565
key='B97B0AFCAA1A47F044F244A07FCC7D46ACCC4CF8'; \
6666
export GNUPGHOME="$(mktemp -d)"; \
67-
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
68-
gpg --export "$key" > /etc/apt/trusted.gpg.d/postgres.gpg; \
67+
gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
68+
gpg --batch --export "$key" > /etc/apt/trusted.gpg.d/postgres.gpg; \
6969
command -v gpgconf > /dev/null && gpgconf --kill all; \
7070
rm -rf "$GNUPGHOME"; \
7171
apt-key list

‎9.3/Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ 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 --keyserver ha.pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \
31+
&& gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \
3232
&& gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu \
3333
&& { command -v gpgconf > /dev/null && gpgconf --kill all || :; } \
3434
&& rm -rf "$GNUPGHOME" /usr/local/bin/gosu.asc \
@@ -64,8 +64,8 @@ RUN set -ex; \
6464
# uid PostgreSQL Debian Repository
6565
key='B97B0AFCAA1A47F044F244A07FCC7D46ACCC4CF8'; \
6666
export GNUPGHOME="$(mktemp -d)"; \
67-
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
68-
gpg --export "$key" > /etc/apt/trusted.gpg.d/postgres.gpg; \
67+
gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
68+
gpg --batch --export "$key" > /etc/apt/trusted.gpg.d/postgres.gpg; \
6969
command -v gpgconf > /dev/null && gpgconf --kill all; \
7070
rm -rf "$GNUPGHOME"; \
7171
apt-key list

‎9.4/Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ 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 --keyserver ha.pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \
31+
&& gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \
3232
&& gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu \
3333
&& { command -v gpgconf > /dev/null && gpgconf --kill all || :; } \
3434
&& rm -rf "$GNUPGHOME" /usr/local/bin/gosu.asc \
@@ -64,8 +64,8 @@ RUN set -ex; \
6464
# uid PostgreSQL Debian Repository
6565
key='B97B0AFCAA1A47F044F244A07FCC7D46ACCC4CF8'; \
6666
export GNUPGHOME="$(mktemp -d)"; \
67-
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
68-
gpg --export "$key" > /etc/apt/trusted.gpg.d/postgres.gpg; \
67+
gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
68+
gpg --batch --export "$key" > /etc/apt/trusted.gpg.d/postgres.gpg; \
6969
command -v gpgconf > /dev/null && gpgconf --kill all; \
7070
rm -rf "$GNUPGHOME"; \
7171
apt-key list

‎9.5/Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ 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 --keyserver ha.pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \
31+
&& gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \
3232
&& gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu \
3333
&& { command -v gpgconf > /dev/null && gpgconf --kill all || :; } \
3434
&& rm -rf "$GNUPGHOME" /usr/local/bin/gosu.asc \
@@ -64,8 +64,8 @@ RUN set -ex; \
6464
# uid PostgreSQL Debian Repository
6565
key='B97B0AFCAA1A47F044F244A07FCC7D46ACCC4CF8'; \
6666
export GNUPGHOME="$(mktemp -d)"; \
67-
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
68-
gpg --export "$key" > /etc/apt/trusted.gpg.d/postgres.gpg; \
67+
gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
68+
gpg --batch --export "$key" > /etc/apt/trusted.gpg.d/postgres.gpg; \
6969
command -v gpgconf > /dev/null && gpgconf --kill all; \
7070
rm -rf "$GNUPGHOME"; \
7171
apt-key list

‎9.6/Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ 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 --keyserver ha.pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \
31+
&& gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \
3232
&& gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu \
3333
&& { command -v gpgconf > /dev/null && gpgconf --kill all || :; } \
3434
&& rm -rf "$GNUPGHOME" /usr/local/bin/gosu.asc \
@@ -64,8 +64,8 @@ RUN set -ex; \
6464
# uid PostgreSQL Debian Repository
6565
key='B97B0AFCAA1A47F044F244A07FCC7D46ACCC4CF8'; \
6666
export GNUPGHOME="$(mktemp -d)"; \
67-
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
68-
gpg --export "$key" > /etc/apt/trusted.gpg.d/postgres.gpg; \
67+
gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
68+
gpg --batch --export "$key" > /etc/apt/trusted.gpg.d/postgres.gpg; \
6969
command -v gpgconf > /dev/null && gpgconf --kill all; \
7070
rm -rf "$GNUPGHOME"; \
7171
apt-key list

‎Dockerfile-debian.template

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ 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 --keyserver ha.pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \
31+
&& gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \
3232
&& gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu \
3333
&& { command -v gpgconf > /dev/null && gpgconf --kill all || :; } \
3434
&& rm -rf "$GNUPGHOME" /usr/local/bin/gosu.asc \
@@ -64,8 +64,8 @@ RUN set -ex; \
6464
# uid PostgreSQL Debian Repository
6565
key='B97B0AFCAA1A47F044F244A07FCC7D46ACCC4CF8'; \
6666
export GNUPGHOME="$(mktemp -d)"; \
67-
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
68-
gpg --export "$key" > /etc/apt/trusted.gpg.d/postgres.gpg; \
67+
gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
68+
gpg --batch --export "$key" > /etc/apt/trusted.gpg.d/postgres.gpg; \
6969
command -v gpgconf > /dev/null && gpgconf --kill all; \
7070
rm -rf "$GNUPGHOME"; \
7171
apt-key list

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy