Skip to content

Commit cb722bc

Browse files
yosifkityosifkit
authored
Merge pull request #314 from infosiftr/gpg-batch
Update "gpg" invocations to use "--batch"
2 parents 2674c80 + 6932ac2 commit cb722bc

File tree

5 files changed

+15
-15
lines changed

5 files changed

+15
-15
lines changed

‎3.2/Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ RUN set -ex; \
2727
wget -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$dpkgArch"; \
2828
wget -O /usr/local/bin/gosu.asc "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$dpkgArch.asc"; \
2929
export GNUPGHOME="$(mktemp -d)"; \
30-
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4; \
30+
gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4; \
3131
gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu; \
3232
command -v gpgconf && gpgconf --kill all || :; \
3333
rm -r "$GNUPGHOME" /usr/local/bin/gosu.asc; \
@@ -54,9 +54,9 @@ ENV GPG_KEYS \
5454
RUN set -ex; \
5555
export GNUPGHOME="$(mktemp -d)"; \
5656
for key in $GPG_KEYS; do \
57-
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
57+
gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
5858
done; \
59-
gpg --export $GPG_KEYS > /etc/apt/trusted.gpg.d/mongodb.gpg; \
59+
gpg --batch --export $GPG_KEYS > /etc/apt/trusted.gpg.d/mongodb.gpg; \
6060
command -v gpgconf && gpgconf --kill all || :; \
6161
rm -r "$GNUPGHOME"; \
6262
apt-key list

‎3.4/Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ RUN set -ex; \
2727
wget -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$dpkgArch"; \
2828
wget -O /usr/local/bin/gosu.asc "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$dpkgArch.asc"; \
2929
export GNUPGHOME="$(mktemp -d)"; \
30-
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4; \
30+
gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4; \
3131
gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu; \
3232
command -v gpgconf && gpgconf --kill all || :; \
3333
rm -r "$GNUPGHOME" /usr/local/bin/gosu.asc; \
@@ -50,9 +50,9 @@ ENV GPG_KEYS \
5050
RUN set -ex; \
5151
export GNUPGHOME="$(mktemp -d)"; \
5252
for key in $GPG_KEYS; do \
53-
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
53+
gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
5454
done; \
55-
gpg --export $GPG_KEYS > /etc/apt/trusted.gpg.d/mongodb.gpg; \
55+
gpg --batch --export $GPG_KEYS > /etc/apt/trusted.gpg.d/mongodb.gpg; \
5656
command -v gpgconf && gpgconf --kill all || :; \
5757
rm -r "$GNUPGHOME"; \
5858
apt-key list

‎3.6/Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ RUN set -ex; \
2929
wget -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$dpkgArch"; \
3030
wget -O /usr/local/bin/gosu.asc "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$dpkgArch.asc"; \
3131
export GNUPGHOME="$(mktemp -d)"; \
32-
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4; \
32+
gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4; \
3333
gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu; \
3434
gpgconf --kill all; \
3535
rm -r "$GNUPGHOME" /usr/local/bin/gosu.asc; \
@@ -52,9 +52,9 @@ ENV GPG_KEYS \
5252
RUN set -ex; \
5353
export GNUPGHOME="$(mktemp -d)"; \
5454
for key in $GPG_KEYS; do \
55-
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
55+
gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
5656
done; \
57-
gpg --export $GPG_KEYS > /etc/apt/trusted.gpg.d/mongodb.gpg; \
57+
gpg --batch --export $GPG_KEYS > /etc/apt/trusted.gpg.d/mongodb.gpg; \
5858
gpgconf --kill all; \
5959
rm -r "$GNUPGHOME"; \
6060
apt-key list

‎4.0/Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ RUN set -ex; \
2727
wget -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$dpkgArch"; \
2828
wget -O /usr/local/bin/gosu.asc "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$dpkgArch.asc"; \
2929
export GNUPGHOME="$(mktemp -d)"; \
30-
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4; \
30+
gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4; \
3131
gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu; \
3232
command -v gpgconf && gpgconf --kill all || :; \
3333
rm -r "$GNUPGHOME" /usr/local/bin/gosu.asc; \
@@ -50,9 +50,9 @@ ENV GPG_KEYS \
5050
RUN set -ex; \
5151
export GNUPGHOME="$(mktemp -d)"; \
5252
for key in $GPG_KEYS; do \
53-
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
53+
gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
5454
done; \
55-
gpg --export $GPG_KEYS > /etc/apt/trusted.gpg.d/mongodb.gpg; \
55+
gpg --batch --export $GPG_KEYS > /etc/apt/trusted.gpg.d/mongodb.gpg; \
5656
command -v gpgconf && gpgconf --kill all || :; \
5757
rm -r "$GNUPGHOME"; \
5858
apt-key list

‎4.1/Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ RUN set -ex; \
2727
wget -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$dpkgArch"; \
2828
wget -O /usr/local/bin/gosu.asc "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$dpkgArch.asc"; \
2929
export GNUPGHOME="$(mktemp -d)"; \
30-
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4; \
30+
gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4; \
3131
gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu; \
3232
command -v gpgconf && gpgconf --kill all || :; \
3333
rm -r "$GNUPGHOME" /usr/local/bin/gosu.asc; \
@@ -50,9 +50,9 @@ ENV GPG_KEYS \
5050
RUN set -ex; \
5151
export GNUPGHOME="$(mktemp -d)"; \
5252
for key in $GPG_KEYS; do \
53-
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
53+
gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
5454
done; \
55-
gpg --export $GPG_KEYS > /etc/apt/trusted.gpg.d/mongodb.gpg; \
55+
gpg --batch --export $GPG_KEYS > /etc/apt/trusted.gpg.d/mongodb.gpg; \
5656
command -v gpgconf && gpgconf --kill all || :; \
5757
rm -r "$GNUPGHOME"; \
5858
apt-key list

0 commit comments

Comments
 (0)