Skip to content

Commit 9e0ea0b

Browse files
yosifkityosifkit
authored
Merge pull request #515 from infosiftr/gpg-batch
Update "gpg" invocations to use "--batch"
2 parents 7ca585e + 696fc89 commit 9e0ea0b

File tree

4 files changed

+11
-11
lines changed

4 files changed

+11
-11
lines changed

‎5.5/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ RUN set -x \
1212
&& wget -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$(dpkg --print-architecture)" \
1313
&& wget -O /usr/local/bin/gosu.asc "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$(dpkg --print-architecture).asc" \
1414
&& export GNUPGHOME="$(mktemp -d)" \
15-
&& gpg --keyserver ha.pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \
15+
&& gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \
1616
&& gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu \
1717
&& gpgconf --kill all \
1818
&& rm -rf "$GNUPGHOME" /usr/local/bin/gosu.asc \
@@ -46,7 +46,7 @@ RUN apt-get update && apt-get install -y ca-certificates wget --no-install-recom
4646
&& apt-get purge -y --auto-remove ca-certificates wget \
4747
&& export GNUPGHOME="$(mktemp -d)" \
4848
# gpg: key 5072E1F5: public key "MySQL Release Engineering <[email protected]>" imported
49-
&& gpg --keyserver ha.pool.sks-keyservers.net --recv-keys A4A9406876FCBD3C456770C88C718D3B5072E1F5 \
49+
&& gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys A4A9406876FCBD3C456770C88C718D3B5072E1F5 \
5050
&& gpg --batch --verify mysql.tar.gz.asc mysql.tar.gz \
5151
&& gpgconf --kill all \
5252
&& rm -rf "$GNUPGHOME" mysql.tar.gz.asc \

‎5.6/Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ RUN set -x \
1212
&& wget -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$(dpkg --print-architecture)" \
1313
&& wget -O /usr/local/bin/gosu.asc "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$(dpkg --print-architecture).asc" \
1414
&& export GNUPGHOME="$(mktemp -d)" \
15-
&& gpg --keyserver ha.pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \
15+
&& gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \
1616
&& gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu \
1717
&& gpgconf --kill all \
1818
&& rm -rf "$GNUPGHOME" /usr/local/bin/gosu.asc \
@@ -37,8 +37,8 @@ RUN set -ex; \
3737
# gpg: key 5072E1F5: public key "MySQL Release Engineering <[email protected]>" imported
3838
key='A4A9406876FCBD3C456770C88C718D3B5072E1F5'; \
3939
export GNUPGHOME="$(mktemp -d)"; \
40-
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
41-
gpg --export "$key" > /etc/apt/trusted.gpg.d/mysql.gpg; \
40+
gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
41+
gpg --batch --export "$key" > /etc/apt/trusted.gpg.d/mysql.gpg; \
4242
gpgconf --kill all; \
4343
rm -rf "$GNUPGHOME"; \
4444
apt-key list > /dev/null

‎5.7/Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ RUN set -x \
1212
&& wget -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$(dpkg --print-architecture)" \
1313
&& wget -O /usr/local/bin/gosu.asc "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$(dpkg --print-architecture).asc" \
1414
&& export GNUPGHOME="$(mktemp -d)" \
15-
&& gpg --keyserver ha.pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \
15+
&& gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \
1616
&& gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu \
1717
&& gpgconf --kill all \
1818
&& rm -rf "$GNUPGHOME" /usr/local/bin/gosu.asc \
@@ -39,8 +39,8 @@ RUN set -ex; \
3939
# gpg: key 5072E1F5: public key "MySQL Release Engineering <[email protected]>" imported
4040
key='A4A9406876FCBD3C456770C88C718D3B5072E1F5'; \
4141
export GNUPGHOME="$(mktemp -d)"; \
42-
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
43-
gpg --export "$key" > /etc/apt/trusted.gpg.d/mysql.gpg; \
42+
gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
43+
gpg --batch --export "$key" > /etc/apt/trusted.gpg.d/mysql.gpg; \
4444
gpgconf --kill all; \
4545
rm -rf "$GNUPGHOME"; \
4646
apt-key list > /dev/null

‎8.0/Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ RUN set -x \
1212
&& wget -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$(dpkg --print-architecture)" \
1313
&& wget -O /usr/local/bin/gosu.asc "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$(dpkg --print-architecture).asc" \
1414
&& export GNUPGHOME="$(mktemp -d)" \
15-
&& gpg --keyserver ha.pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \
15+
&& gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \
1616
&& gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu \
1717
&& gpgconf --kill all \
1818
&& rm -rf "$GNUPGHOME" /usr/local/bin/gosu.asc \
@@ -39,8 +39,8 @@ RUN set -ex; \
3939
# gpg: key 5072E1F5: public key "MySQL Release Engineering <[email protected]>" imported
4040
key='A4A9406876FCBD3C456770C88C718D3B5072E1F5'; \
4141
export GNUPGHOME="$(mktemp -d)"; \
42-
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
43-
gpg --export "$key" > /etc/apt/trusted.gpg.d/mysql.gpg; \
42+
gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
43+
gpg --batch --export "$key" > /etc/apt/trusted.gpg.d/mysql.gpg; \
4444
gpgconf --kill all; \
4545
rm -rf "$GNUPGHOME"; \
4646
apt-key list > /dev/null

0 commit comments

Comments
 (0)