浏览代码

HADOOP-17056. shelldoc fails in hadoop-common. (#2045)

In the docker build image, skip GPG verification when downloading
Yetus tarball via yetus-wrapper.
Akira Ajisaka 4 年之前
父节点
当前提交
9c290c08db
共有 3 个文件被更改,包括 7 次插入1 次删除
  1. 1 1
      dev-support/bin/yetus-wrapper
  2. 3 0
      dev-support/docker/Dockerfile
  3. 3 0
      dev-support/docker/Dockerfile_aarch64

+ 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

+ 3 - 0
dev-support/docker/Dockerfile

@@ -183,6 +183,9 @@ RUN curl -L -s -S \
 ###
 ###
 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.
 # So tell Yetus not to read the rest of the file:
 # So tell Yetus not to read the rest of the file:

+ 3 - 0
dev-support/docker/Dockerfile_aarch64

@@ -218,6 +218,9 @@ RUN mkdir -p /opt/phantomjs \
 ###
 ###
 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.
 # So tell Yetus not to read the rest of the file:
 # So tell Yetus not to read the rest of the file: