Skip to content

Commit de4f1aa

Browse files
committed
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 9c290c0) Conflicts: dev-support/docker/Dockerfile dev-support/docker/Dockerfile_aarch64 (cherry picked from commit aa19a2a)
1 parent 30c639a commit de4f1aa

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

dev-support/bin/yetus-wrapper

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ else
144144
exit 1
145145
fi
146146

147-
if [[ -n "${GPGBIN}" ]]; then
147+
if [[ -n "${GPGBIN}" && ! "${HADOOP_SKIP_YETUS_VERIFICATION}" = true ]]; then
148148
if ! mkdir -p .gpg; then
149149
yetus_error "ERROR: yetus-dl: Unable to create ${HADOOP_PATCHPROCESS}/.gpg"
150150
exit 1

dev-support/docker/Dockerfile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -179,6 +179,8 @@ RUN apt-get -y install nodejs && \
179179
###
180180
ENV MAVEN_OPTS -Xms256m -Xmx1536m
181181

182+
# Skip gpg verification when downlonading Yetus via yetus-wrapper
183+
ENV HADOOP_SKIP_YETUS_VERIFICATION true
182184

183185
###
184186
# Everything past this point is either not needed for testing or breaks Yetus.

0 commit comments

Comments
 (0)