Skip to content

Commit 9c290c0

Browse files
authored
HADOOP-17056. shelldoc fails in hadoop-common. (#2045)
In the docker build image, skip GPG verification when downloading Yetus tarball via yetus-wrapper.
1 parent e8cb2ae commit 9c290c0

File tree

3 files changed

+7
-1
lines changed

3 files changed

+7
-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: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -183,6 +183,9 @@ RUN curl -L -s -S \
183183
###
184184
ENV MAVEN_OPTS -Xms256m -Xmx1536m
185185

186+
# Skip gpg verification when downlonading Yetus via yetus-wrapper
187+
ENV HADOOP_SKIP_YETUS_VERIFICATION true
188+
186189
###
187190
# Everything past this point is either not needed for testing or breaks Yetus.
188191
# So tell Yetus not to read the rest of the file:

dev-support/docker/Dockerfile_aarch64

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -218,6 +218,9 @@ RUN mkdir -p /opt/phantomjs \
218218
###
219219
ENV MAVEN_OPTS -Xms256m -Xmx1536m
220220

221+
# Skip gpg verification when downlonading Yetus via yetus-wrapper
222+
ENV HADOOP_SKIP_YETUS_VERIFICATION true
223+
221224
###
222225
# Everything past this point is either not needed for testing or breaks Yetus.
223226
# So tell Yetus not to read the rest of the file:

0 commit comments

Comments
 (0)