Skip to content

Commit 353524c

Browse files
authored
Merge pull request #140 from infosiftr/gpg-batch
Update "gpg" invocations to use "--batch"
2 parents aab2a6f + c3e8976 commit 353524c

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

3.3/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ RUN set -eux; \
3939
wget -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$dpkgArch"; \
4040
wget -O /usr/local/bin/gosu.asc "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$dpkgArch.asc"; \
4141
export GNUPGHOME="$(mktemp -d)"; \
42-
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4; \
42+
gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4; \
4343
gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu; \
4444
gpgconf --kill all; \
4545
rm -r "$GNUPGHOME" /usr/local/bin/gosu.asc; \
@@ -52,7 +52,7 @@ RUN set -eux; \
5252
wget -O /usr/local/bin/tini "https://github.com/krallin/tini/releases/download/v$TINI_VERSION/tini-$dpkgArch"; \
5353
wget -O /usr/local/bin/tini.asc "https://github.com/krallin/tini/releases/download/v$TINI_VERSION/tini-$dpkgArch.asc"; \
5454
export GNUPGHOME="$(mktemp -d)"; \
55-
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys 6380DC428747F6C393FEACA59A84159D7001A4E5; \
55+
gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys 6380DC428747F6C393FEACA59A84159D7001A4E5; \
5656
gpg --batch --verify /usr/local/bin/tini.asc /usr/local/bin/tini; \
5757
gpgconf --kill all; \
5858
rm -r "$GNUPGHOME" /usr/local/bin/tini.asc; \

3.4/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ RUN set -eux; \
3939
wget -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$dpkgArch"; \
4040
wget -O /usr/local/bin/gosu.asc "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$dpkgArch.asc"; \
4141
export GNUPGHOME="$(mktemp -d)"; \
42-
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4; \
42+
gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4; \
4343
gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu; \
4444
gpgconf --kill all; \
4545
rm -r "$GNUPGHOME" /usr/local/bin/gosu.asc; \
@@ -52,7 +52,7 @@ RUN set -eux; \
5252
wget -O /usr/local/bin/tini "https://github.com/krallin/tini/releases/download/v$TINI_VERSION/tini-$dpkgArch"; \
5353
wget -O /usr/local/bin/tini.asc "https://github.com/krallin/tini/releases/download/v$TINI_VERSION/tini-$dpkgArch.asc"; \
5454
export GNUPGHOME="$(mktemp -d)"; \
55-
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys 6380DC428747F6C393FEACA59A84159D7001A4E5; \
55+
gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys 6380DC428747F6C393FEACA59A84159D7001A4E5; \
5656
gpg --batch --verify /usr/local/bin/tini.asc /usr/local/bin/tini; \
5757
gpgconf --kill all; \
5858
rm -r "$GNUPGHOME" /usr/local/bin/tini.asc; \

Dockerfile.template

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ RUN set -eux; \
3939
wget -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$dpkgArch"; \
4040
wget -O /usr/local/bin/gosu.asc "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$dpkgArch.asc"; \
4141
export GNUPGHOME="$(mktemp -d)"; \
42-
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4; \
42+
gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4; \
4343
gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu; \
4444
gpgconf --kill all; \
4545
rm -r "$GNUPGHOME" /usr/local/bin/gosu.asc; \
@@ -52,7 +52,7 @@ RUN set -eux; \
5252
wget -O /usr/local/bin/tini "https://github.com/krallin/tini/releases/download/v$TINI_VERSION/tini-$dpkgArch"; \
5353
wget -O /usr/local/bin/tini.asc "https://github.com/krallin/tini/releases/download/v$TINI_VERSION/tini-$dpkgArch.asc"; \
5454
export GNUPGHOME="$(mktemp -d)"; \
55-
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys 6380DC428747F6C393FEACA59A84159D7001A4E5; \
55+
gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys 6380DC428747F6C393FEACA59A84159D7001A4E5; \
5656
gpg --batch --verify /usr/local/bin/tini.asc /usr/local/bin/tini; \
5757
gpgconf --kill all; \
5858
rm -r "$GNUPGHOME" /usr/local/bin/tini.asc; \

0 commit comments

Comments
 (0)