Skip to content

Commit 58d2885

Browse files
committed
[SPARK-40513] Add --batch to gpg command
### What changes were proposed in this pull request? Add --batch to gpg command which essentially puts GnuPG into "API mode" instead of "UI mode". Apply changes to 3.4.x dockerfile. ### Why are the changes needed? Address DOI comments: docker-library/official-images#13089 (comment) ### Does this PR introduce _any_ user-facing change? No ### How was this patch tested? CI passed Closes #51 from Yikun/batch. Authored-by: Yikun Jiang <yikunkero@gmail.com> Signed-off-by: Yikun Jiang <yikunkero@gmail.com>
1 parent 39264c5 commit 58d2885

3 files changed

Lines changed: 6 additions & 6 deletions

File tree

3.4.0/scala2.12-java11-ubuntu/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@ RUN set -ex; \
4646
wget -nv -O spark.tgz "$SPARK_TGZ_URL"; \
4747
wget -nv -O spark.tgz.asc "$SPARK_TGZ_ASC_URL"; \
4848
export GNUPGHOME="$(mktemp -d)"; \
49-
gpg --keyserver hkps://keys.openpgp.org --recv-key "$GPG_KEY" || \
50-
gpg --keyserver hkps://keyserver.ubuntu.com --recv-keys "$GPG_KEY"; \
49+
gpg --batch --keyserver hkps://keys.openpgp.org --recv-key "$GPG_KEY" || \
50+
gpg --batch --keyserver hkps://keyserver.ubuntu.com --recv-keys "$GPG_KEY"; \
5151
gpg --batch --verify spark.tgz.asc spark.tgz; \
5252
gpgconf --kill all; \
5353
rm -rf "$GNUPGHOME" spark.tgz.asc; \

3.4.1/scala2.12-java11-ubuntu/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@ RUN set -ex; \
4646
wget -nv -O spark.tgz "$SPARK_TGZ_URL"; \
4747
wget -nv -O spark.tgz.asc "$SPARK_TGZ_ASC_URL"; \
4848
export GNUPGHOME="$(mktemp -d)"; \
49-
gpg --keyserver hkps://keys.openpgp.org --recv-key "$GPG_KEY" || \
50-
gpg --keyserver hkps://keyserver.ubuntu.com --recv-keys "$GPG_KEY"; \
49+
gpg --batch --keyserver hkps://keys.openpgp.org --recv-key "$GPG_KEY" || \
50+
gpg --batch --keyserver hkps://keyserver.ubuntu.com --recv-keys "$GPG_KEY"; \
5151
gpg --batch --verify spark.tgz.asc spark.tgz; \
5252
gpgconf --kill all; \
5353
rm -rf "$GNUPGHOME" spark.tgz.asc; \

Dockerfile.template

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@ RUN set -ex; \
4646
wget -nv -O spark.tgz "$SPARK_TGZ_URL"; \
4747
wget -nv -O spark.tgz.asc "$SPARK_TGZ_ASC_URL"; \
4848
export GNUPGHOME="$(mktemp -d)"; \
49-
gpg --keyserver hkps://keys.openpgp.org --recv-key "$GPG_KEY" || \
50-
gpg --keyserver hkps://keyserver.ubuntu.com --recv-keys "$GPG_KEY"; \
49+
gpg --batch --keyserver hkps://keys.openpgp.org --recv-key "$GPG_KEY" || \
50+
gpg --batch --keyserver hkps://keyserver.ubuntu.com --recv-keys "$GPG_KEY"; \
5151
gpg --batch --verify spark.tgz.asc spark.tgz; \
5252
gpgconf --kill all; \
5353
rm -rf "$GNUPGHOME" spark.tgz.asc; \

0 commit comments

Comments
 (0)