Browse Source

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

(cherry picked from commit aa19a2af17fa4269f3206bdaec23c10dc91dd11a)
Akira Ajisaka 5 years ago
parent
commit
de4f1aabfa
2 changed files with 3 additions and 1 deletions
  1. 1 1
      dev-support/bin/yetus-wrapper
  2. 2 0
      dev-support/docker/Dockerfile

+ 1 - 1
dev-support/bin/yetus-wrapper

@@ -144,7 +144,7 @@ else
   exit 1
   exit 1
 fi
 fi
 
 
-if [[ -n "${GPGBIN}" ]]; then
+if [[ -n "${GPGBIN}" && ! "${HADOOP_SKIP_YETUS_VERIFICATION}" = true ]]; then
   if ! mkdir -p .gpg; then
   if ! mkdir -p .gpg; then
     yetus_error "ERROR: yetus-dl: Unable to create ${HADOOP_PATCHPROCESS}/.gpg"
     yetus_error "ERROR: yetus-dl: Unable to create ${HADOOP_PATCHPROCESS}/.gpg"
     exit 1
     exit 1

+ 2 - 0
dev-support/docker/Dockerfile

@@ -179,6 +179,8 @@ RUN apt-get -y install nodejs && \
 ###
 ###
 ENV MAVEN_OPTS -Xms256m -Xmx1536m
 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.
 # Everything past this point is either not needed for testing or breaks Yetus.