big-data/hadoop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[HADOOP-18786] Use CDN instead of ASF archive (#5789)

Browse Source 
* Use Yetus 0.14.1 from downloads.apache.org in yetus-wrapper
* Use Maven 3.8.8 from downloads.apache.org in Win 10 Dockerfile
* Point users to downloads.apache.org for JVSC
* Use Solr 8.11.2 from downloads.apache.org in YARN Dockerfile

Contributed by Christopher Tubbs
This commit is contained in:
Christopher Tubbs 2024-05-14 15:09:52 -04:00 committed by GitHub
parent 39dee8ea19
commit 2e77b7b02c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dev-support/bin/yetus-wrapper
View File

@ -77,7 +77,7 @@ WANTED="$1"
shift shift
ARGV=("$@") ARGV=("$@")
HADOOP_YETUS_VERSION=${HADOOP_YETUS_VERSION:-0.14.0} HADOOP_YETUS_VERSION=${HADOOP_YETUS_VERSION:-0.14.1}
BIN=$(yetus_abs "${BASH_SOURCE-$0}") BIN=$(yetus_abs "${BASH_SOURCE-$0}")
BINDIR=$(dirname "${BIN}") BINDIR=$(dirname "${BIN}")
@ -123,7 +123,7 @@ fi
## need to DL, etc ## need to DL, etc
## ##
BASEURL="https://archive.apache.org/dist/yetus/${HADOOP_YETUS_VERSION}/" BASEURL="https://downloads.apache.org/yetus/${HADOOP_YETUS_VERSION}/"
TARBALL="${YETUS_PREFIX}-${HADOOP_YETUS_VERSION}-bin.tar" TARBALL="${YETUS_PREFIX}-${HADOOP_YETUS_VERSION}-bin.tar"
GPGBIN=$(command -v gpg) GPGBIN=$(command -v gpg)

6
dev-support/docker/Dockerfile_windows_10
View File

@ -61,8 +61,8 @@ RUN powershell Invoke-WebRequest -URI https://cdn.azul.com/zulu/bin/zulu8.62.0.1
RUN powershell Expand-Archive -Path $Env:TEMP\zulu8.62.0.19-ca-jdk8.0.332-win_x64.zip -DestinationPath "C:\Java" RUN powershell Expand-Archive -Path $Env:TEMP\zulu8.62.0.19-ca-jdk8.0.332-win_x64.zip -DestinationPath "C:\Java"
# Install Apache Maven. # Install Apache Maven.
RUN powershell Invoke-WebRequest -URI https://archive.apache.org/dist/maven/maven-3/3.8.6/binaries/apache-maven-3.8.6-bin.zip -OutFile $Env:TEMP\apache-maven-3.8.6-bin.zip RUN powershell Invoke-WebRequest -URI https://downloads.apache.org/maven/maven-3/3.8.8/binaries/apache-maven-3.8.8-bin.zip -OutFile $Env:TEMP\apache-maven-3.8.8-bin.zip
RUN powershell Expand-Archive -Path $Env:TEMP\apache-maven-3.8.6-bin.zip -DestinationPath "C:\Maven" RUN powershell Expand-Archive -Path $Env:TEMP\apache-maven-3.8.8-bin.zip -DestinationPath "C:\Maven"
# Install CMake 3.19.0. # Install CMake 3.19.0.
RUN powershell Invoke-WebRequest -URI https://cmake.org/files/v3.19/cmake-3.19.0-win64-x64.zip -OutFile $Env:TEMP\cmake-3.19.0-win64-x64.zip RUN powershell Invoke-WebRequest -URI https://cmake.org/files/v3.19/cmake-3.19.0-win64-x64.zip -OutFile $Env:TEMP\cmake-3.19.0-win64-x64.zip
@ -135,7 +135,7 @@ ENV MAVEN_OPTS '-Xmx2048M -Xss128M'
ENV IS_WINDOWS 1 ENV IS_WINDOWS 1
RUN setx PATH "%PATH%;%ALLUSERSPROFILE%\chocolatey\bin" RUN setx PATH "%PATH%;%ALLUSERSPROFILE%\chocolatey\bin"
RUN setx PATH "%PATH%;%JAVA_HOME%\bin" RUN setx PATH "%PATH%;%JAVA_HOME%\bin"
RUN setx PATH "%PATH%;C:\Maven\apache-maven-3.8.6\bin" RUN setx PATH "%PATH%;C:\Maven\apache-maven-3.8.8\bin"
RUN setx PATH "%PATH%;C:\CMake\cmake-3.19.0-win64-x64\bin" RUN setx PATH "%PATH%;C:\CMake\cmake-3.19.0-win64-x64\bin"
RUN setx PATH "%PATH%;C:\ZStd" RUN setx PATH "%PATH%;C:\ZStd"
RUN setx PATH "%PATH%;C:\Program Files\Git\usr\bin" RUN setx PATH "%PATH%;C:\Program Files\Git\usr\bin"

2
hadoop-common-project/hadoop-common/src/main/bin/hadoop-functions.sh
View File

@ -1911,7 +1911,7 @@ function hadoop_start_secure_daemon
if [[ ! -f "${jsvc}" ]]; then if [[ ! -f "${jsvc}" ]]; then
hadoop_error "JSVC_HOME is not set or set incorrectly. jsvc is required to run secure" hadoop_error "JSVC_HOME is not set or set incorrectly. jsvc is required to run secure"
hadoop_error "or privileged daemons. Please download and install jsvc from " hadoop_error "or privileged daemons. Please download and install jsvc from "
hadoop_error "http://archive.apache.org/dist/commons/daemon/binaries/ " hadoop_error "https://downloads.apache.org/commons/daemon/binaries/ "
hadoop_error "and set JSVC_HOME to the directory containing the jsvc binary." hadoop_error "and set JSVC_HOME to the directory containing the jsvc binary."
exit 1 exit 1
fi fi

2
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-docker/Dockerfile
View File

@ -19,7 +19,7 @@ FROM centos:7
RUN yum -y install tomcat lsof krb5-workstation sssd-client curl RUN yum -y install tomcat lsof krb5-workstation sssd-client curl
SHELL ["/bin/bash", "-o", "pipefail", "-c"] SHELL ["/bin/bash", "-o", "pipefail", "-c"]
RUN mkdir -p /opt/apache/solr && \ RUN mkdir -p /opt/apache/solr && \
curl -SL http://archive.apache.org/dist/lucene/solr/7.7.0/solr-7.7.0.tgz | \ curl -SL https://downloads.apache.org/lucene/solr/8.11.2/solr-8.11.2.tgz | \
tar -xzC /opt/apache/solr --strip 1 tar -xzC /opt/apache/solr --strip 1
COPY src/main/scripts/setup-image.sh /setup-image.sh COPY src/main/scripts/setup-image.sh /setup-image.sh
COPY src/main/resources/samples.xml /tmp/samples.xml COPY src/main/resources/samples.xml /tmp/samples.xml