Skip to content

Commit 313ee97

Browse files
authored
Merge pull request #185 from infosiftr/gpg-batch
Update "gpg" invocations to use "--batch"
2 parents 7d09a4e + a912899 commit 313ee97

File tree

4 files changed

+8
-8
lines changed

4 files changed

+8
-8
lines changed

5/Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ RUN set -x \
66
&& wget -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$(dpkg --print-architecture)" \
77
&& wget -O /usr/local/bin/gosu.asc "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$(dpkg --print-architecture).asc" \
88
&& export GNUPGHOME="$(mktemp -d)" \
9-
&& gpg --keyserver ha.pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \
9+
&& gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \
1010
&& gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu \
1111
&& rm -rf "$GNUPGHOME" /usr/local/bin/gosu.asc \
1212
&& chmod +x /usr/local/bin/gosu \
@@ -16,8 +16,8 @@ RUN set -ex; \
1616
# https://artifacts.elastic.co/GPG-KEY-elasticsearch
1717
key='46095ACC8548582C1A2699A9D27D666CD88E42B4'; \
1818
export GNUPGHOME="$(mktemp -d)"; \
19-
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
20-
gpg --export "$key" > /etc/apt/trusted.gpg.d/elastic.gpg; \
19+
gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
20+
gpg --batch --export "$key" > /etc/apt/trusted.gpg.d/elastic.gpg; \
2121
rm -rf "$GNUPGHOME"; \
2222
apt-key list
2323

5/alpine/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ RUN set -ex; \
3636
if [ "$ELASTICSEARCH_TARBALL_ASC" ]; then \
3737
wget -O elasticsearch.tar.gz.asc "$ELASTICSEARCH_TARBALL_ASC"; \
3838
export GNUPGHOME="$(mktemp -d)"; \
39-
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$GPG_KEY"; \
39+
gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys "$GPG_KEY"; \
4040
gpg --batch --verify elasticsearch.tar.gz.asc elasticsearch.tar.gz; \
4141
rm -rf "$GNUPGHOME" elasticsearch.tar.gz.asc; \
4242
fi; \

Dockerfile-alpine.template

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ RUN set -ex; \
3636
if [ "$ELASTICSEARCH_TARBALL_ASC" ]; then \
3737
wget -O elasticsearch.tar.gz.asc "$ELASTICSEARCH_TARBALL_ASC"; \
3838
export GNUPGHOME="$(mktemp -d)"; \
39-
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$GPG_KEY"; \
39+
gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys "$GPG_KEY"; \
4040
gpg --batch --verify elasticsearch.tar.gz.asc elasticsearch.tar.gz; \
4141
rm -rf "$GNUPGHOME" elasticsearch.tar.gz.asc; \
4242
fi; \

Dockerfile-debian.template

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ RUN set -x \
66
&& wget -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$(dpkg --print-architecture)" \
77
&& wget -O /usr/local/bin/gosu.asc "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$(dpkg --print-architecture).asc" \
88
&& export GNUPGHOME="$(mktemp -d)" \
9-
&& gpg --keyserver ha.pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \
9+
&& gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \
1010
&& gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu \
1111
&& rm -rf "$GNUPGHOME" /usr/local/bin/gosu.asc \
1212
&& chmod +x /usr/local/bin/gosu \
@@ -16,8 +16,8 @@ RUN set -ex; \
1616
# https://artifacts.elastic.co/GPG-KEY-elasticsearch
1717
key='46095ACC8548582C1A2699A9D27D666CD88E42B4'; \
1818
export GNUPGHOME="$(mktemp -d)"; \
19-
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
20-
gpg --export "$key" > /etc/apt/trusted.gpg.d/elastic.gpg; \
19+
gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
20+
gpg --batch --export "$key" > /etc/apt/trusted.gpg.d/elastic.gpg; \
2121
rm -rf "$GNUPGHOME"; \
2222
apt-key list
2323

0 commit comments

Comments
 (0)