You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by aa...@apache.org on 2020/06/04 07:41:16 UTC
[hadoop] branch branch-3.2 updated: HADOOP-17056. shelldoc fails in
hadoop-common. (#2045)
This is an automated email from the ASF dual-hosted git repository.
aajisaka pushed a commit to branch branch-3.2
in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/branch-3.2 by this push:
new aa19a2a HADOOP-17056. shelldoc fails in hadoop-common. (#2045)
aa19a2a is described below
commit aa19a2af17fa4269f3206bdaec23c10dc91dd11a
Author: Akira Ajisaka <aa...@apache.org>
AuthorDate: Wed Jun 3 18:01:37 2020 +0900
HADOOP-17056. shelldoc fails in hadoop-common. (#2045)
In the docker build image, skip GPG verification when downloading
Yetus tarball via yetus-wrapper.
(cherry picked from commit 9c290c08db4361de29f392b0569312c2623b8321)
Conflicts:
dev-support/docker/Dockerfile
dev-support/docker/Dockerfile_aarch64
---
dev-support/bin/yetus-wrapper | 2 +-
dev-support/docker/Dockerfile | 2 ++
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/dev-support/bin/yetus-wrapper b/dev-support/bin/yetus-wrapper
index b0f71f1..bca2316 100755
--- a/dev-support/bin/yetus-wrapper
+++ b/dev-support/bin/yetus-wrapper
@@ -144,7 +144,7 @@ else
exit 1
fi
-if [[ -n "${GPGBIN}" ]]; then
+if [[ -n "${GPGBIN}" && ! "${HADOOP_SKIP_YETUS_VERIFICATION}" = true ]]; then
if ! mkdir -p .gpg; then
yetus_error "ERROR: yetus-dl: Unable to create ${HADOOP_PATCHPROCESS}/.gpg"
exit 1
diff --git a/dev-support/docker/Dockerfile b/dev-support/docker/Dockerfile
index a01815f..caec5ed 100644
--- a/dev-support/docker/Dockerfile
+++ b/dev-support/docker/Dockerfile
@@ -202,6 +202,8 @@ RUN curl -L -s -S \
###
ENV MAVEN_OPTS -Xms256m -Xmx1536m
+# Skip gpg verification when downlonading Yetus via yetus-wrapper
+ENV HADOOP_SKIP_YETUS_VERIFICATION true
###
# Everything past this point is either not needed for testing or breaks Yetus.
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org