This is an automated email from the ASF dual-hosted git repository. yikun pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/spark-docker.git
The following commit(s) were added to refs/heads/master by this push: new 58d2885 [SPARK-40513] Add --batch to gpg command 58d2885 is described below commit 58d288546e8419d229f14b62b6a653999e0390f1 Author: Yikun Jiang <yikunk...@gmail.com> AuthorDate: Thu Jun 29 16:05:47 2023 +0800 [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: https://github.com/docker-library/official-images/pull/13089#issuecomment-1611814491 ### 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 <yikunk...@gmail.com> Signed-off-by: Yikun Jiang <yikunk...@gmail.com> --- 3.4.0/scala2.12-java11-ubuntu/Dockerfile | 4 ++-- 3.4.1/scala2.12-java11-ubuntu/Dockerfile | 4 ++-- Dockerfile.template | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/3.4.0/scala2.12-java11-ubuntu/Dockerfile b/3.4.0/scala2.12-java11-ubuntu/Dockerfile index 854f86c..a4b081e 100644 --- a/3.4.0/scala2.12-java11-ubuntu/Dockerfile +++ b/3.4.0/scala2.12-java11-ubuntu/Dockerfile @@ -46,8 +46,8 @@ RUN set -ex; \ wget -nv -O spark.tgz "$SPARK_TGZ_URL"; \ wget -nv -O spark.tgz.asc "$SPARK_TGZ_ASC_URL"; \ export GNUPGHOME="$(mktemp -d)"; \ - gpg --keyserver hkps://keys.openpgp.org --recv-key "$GPG_KEY" || \ - gpg --keyserver hkps://keyserver.ubuntu.com --recv-keys "$GPG_KEY"; \ + gpg --batch --keyserver hkps://keys.openpgp.org --recv-key "$GPG_KEY" || \ + gpg --batch --keyserver hkps://keyserver.ubuntu.com --recv-keys "$GPG_KEY"; \ gpg --batch --verify spark.tgz.asc spark.tgz; \ gpgconf --kill all; \ rm -rf "$GNUPGHOME" spark.tgz.asc; \ diff --git a/3.4.1/scala2.12-java11-ubuntu/Dockerfile b/3.4.1/scala2.12-java11-ubuntu/Dockerfile index 6d62769..d8bba7e 100644 --- a/3.4.1/scala2.12-java11-ubuntu/Dockerfile +++ b/3.4.1/scala2.12-java11-ubuntu/Dockerfile @@ -46,8 +46,8 @@ RUN set -ex; \ wget -nv -O spark.tgz "$SPARK_TGZ_URL"; \ wget -nv -O spark.tgz.asc "$SPARK_TGZ_ASC_URL"; \ export GNUPGHOME="$(mktemp -d)"; \ - gpg --keyserver hkps://keys.openpgp.org --recv-key "$GPG_KEY" || \ - gpg --keyserver hkps://keyserver.ubuntu.com --recv-keys "$GPG_KEY"; \ + gpg --batch --keyserver hkps://keys.openpgp.org --recv-key "$GPG_KEY" || \ + gpg --batch --keyserver hkps://keyserver.ubuntu.com --recv-keys "$GPG_KEY"; \ gpg --batch --verify spark.tgz.asc spark.tgz; \ gpgconf --kill all; \ rm -rf "$GNUPGHOME" spark.tgz.asc; \ diff --git a/Dockerfile.template b/Dockerfile.template index 80b57e2..3d0aacf 100644 --- a/Dockerfile.template +++ b/Dockerfile.template @@ -46,8 +46,8 @@ RUN set -ex; \ wget -nv -O spark.tgz "$SPARK_TGZ_URL"; \ wget -nv -O spark.tgz.asc "$SPARK_TGZ_ASC_URL"; \ export GNUPGHOME="$(mktemp -d)"; \ - gpg --keyserver hkps://keys.openpgp.org --recv-key "$GPG_KEY" || \ - gpg --keyserver hkps://keyserver.ubuntu.com --recv-keys "$GPG_KEY"; \ + gpg --batch --keyserver hkps://keys.openpgp.org --recv-key "$GPG_KEY" || \ + gpg --batch --keyserver hkps://keyserver.ubuntu.com --recv-keys "$GPG_KEY"; \ gpg --batch --verify spark.tgz.asc spark.tgz; \ gpgconf --kill all; \ rm -rf "$GNUPGHOME" spark.tgz.asc; \ --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org For additional commands, e-mail: commits-h...@spark.apache.org