File tree Expand file tree Collapse file tree 6 files changed +15
-13
lines changed Expand file tree Collapse file tree 6 files changed +15
-13
lines changed Original file line number Diff line number Diff line change @@ -61,7 +61,8 @@ ENV PYTHONIOENCODING=utf-8
6161# #####
6262# Set env vars required to build Hadoop
6363# #####
64- ENV MAVEN_HOME /usr
64+ ENV MAVEN_HOME /opt/maven
65+ ENV PATH "${PATH}:${MAVEN_HOME}/bin"
6566# JAVA_HOME must be set in Maven >= 3.5.0 (MNG-6003)
6667ENV JAVA_HOME /usr/lib/jvm/java-8-openjdk-amd64
6768
@@ -88,6 +89,7 @@ ENV HADOOP_SKIP_YETUS_VERIFICATION true
8889# Install packages
8990# ###
9091RUN pkg-resolver/install-common-pkgs.sh
92+ RUN pkg-resolver/install-maven.sh ubuntu:focal
9193RUN pkg-resolver/install-spotbugs.sh ubuntu:focal
9294RUN pkg-resolver/install-boost.sh ubuntu:focal
9395RUN pkg-resolver/install-protobuf.sh ubuntu:focal
Original file line number Diff line number Diff line change @@ -62,7 +62,8 @@ ENV PYTHONIOENCODING=utf-8
6262######
6363# Set env vars required to build Hadoop
6464######
65- ENV MAVEN_HOME /usr
65+ ENV MAVEN_HOME /opt/maven
66+ ENV PATH "${PATH}:${MAVEN_HOME}/bin"
6667# JAVA_HOME must be set in Maven >= 3.5.0 (MNG-6003)
6768ENV JAVA_HOME /usr/lib/jvm/java-8-openjdk-arm64
6869
@@ -92,6 +93,7 @@ ENV QT_QPA_PLATFORM offscreen
9293# Install packages
9394####
9495RUN pkg-resolver/install-common-pkgs.sh
96+ RUN pkg-resolver/install-maven.sh ubuntu:focal::arch64
9597RUN pkg-resolver/install-spotbugs.sh ubuntu:focal::arch64
9698RUN pkg-resolver/install-boost.sh ubuntu:focal::arch64
9799RUN pkg-resolver/install-protobuf.sh ubuntu:focal::arch64
Original file line number Diff line number Diff line change @@ -56,7 +56,8 @@ RUN apt-get -q update \
5656######
5757# Set env vars required to build Hadoop
5858######
59- ENV MAVEN_HOME /usr
59+ ENV MAVEN_HOME /opt/maven
60+ ENV PATH "${PATH}:${MAVEN_HOME}/bin"
6061# JAVA_HOME must be set in Maven >= 3.5.0 (MNG-6003)
6162ENV JAVA_HOME /usr/lib/jvm/java-11-openjdk-amd64
6263
@@ -82,6 +83,7 @@ ENV HADOOP_SKIP_YETUS_VERIFICATION true
8283####
8384# Install packages
8485####
86+ RUN pkg-resolver/install-maven.sh debian:10
8587RUN pkg-resolver/install-cmake.sh debian:10
8688RUN pkg-resolver/install-spotbugs.sh debian:10
8789RUN pkg-resolver/install-boost.sh debian:10
Original file line number Diff line number Diff line change @@ -61,7 +61,8 @@ ENV PYTHONIOENCODING=utf-8
6161######
6262# Set env vars required to build Hadoop
6363######
64- ENV MAVEN_HOME /usr
64+ ENV MAVEN_HOME /opt/maven
65+ ENV PATH "${PATH}:${MAVEN_HOME}/bin"
6566# JAVA_HOME must be set in Maven >= 3.5.0 (MNG-6003)
6667ENV JAVA_HOME /usr/lib/jvm/java-17-openjdk-amd64
6768
@@ -87,6 +88,7 @@ ENV HADOOP_SKIP_YETUS_VERIFICATION true
8788####
8889# Install packages
8990####
91+ RUN pkg-resolver/install-maven.sh ubuntu:noble
9092RUN pkg-resolver/install-spotbugs.sh ubuntu:noble
9193RUN pkg-resolver/install-boost.sh ubuntu:noble
9294RUN pkg-resolver/install-protobuf.sh ubuntu:noble
Original file line number Diff line number Diff line change @@ -62,8 +62,8 @@ RUN powershell Invoke-WebRequest -URI https://cdn.azul.com/zulu/bin/zulu8.62.0.1
6262RUN powershell Expand-Archive -Path $Env:TEMP\zulu8.62.0.19-ca-jdk8.0.332-win_x64.zip -DestinationPath "C:\Java"
6363
6464# Install Apache Maven.
65- RUN powershell Invoke-WebRequest -URI https://archive.apache.org/dist/maven/maven-3/3.8.8 /binaries/apache-maven-3.8.8 -bin.zip -OutFile $Env:TEMP\apache-maven-3.8.8 -bin.zip
66- RUN powershell Expand-Archive -Path $Env:TEMP\apache-maven-3.8.8 -bin.zip -DestinationPath "C:\Maven"
65+ RUN powershell Invoke-WebRequest -URI https://archive.apache.org/dist/maven/maven-3/3.9.10 /binaries/apache-maven-3.9.10 -bin.zip -OutFile $Env:TEMP\apache-maven-3.9.10 -bin.zip
66+ RUN powershell Expand-Archive -Path $Env:TEMP\apache-maven-3.9.10 -bin.zip -DestinationPath "C:\Maven"
6767
6868# Install CMake 3.19.0.
6969RUN 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
@@ -141,7 +141,7 @@ ENV MAVEN_OPTS '-Xmx2048M -Xss128M'
141141ENV IS_WINDOWS 1
142142RUN setx PATH "%PATH%;%ALLUSERSPROFILE%\chocolatey\bin"
143143RUN setx PATH "%PATH%;%JAVA_HOME%\bin"
144- RUN setx PATH "%PATH%;C:\Maven\apache-maven-3.8.8 \bin"
144+ RUN setx PATH "%PATH%;C:\Maven\apache-maven-3.9.10 \bin"
145145RUN setx PATH "%PATH%;C:\CMake\cmake-3.19.0-win64-x64\bin"
146146RUN setx PATH "%PATH%;C:\ZStd"
147147RUN setx PATH "%PATH%;C:\Program Files\Git\usr\bin"
Original file line number Diff line number Diff line change 295295 "centos:7" : " make" ,
296296 "centos:8" : " make"
297297 },
298- "maven" : {
299- "debian:10" : " maven" ,
300- "ubuntu:focal" : " maven" ,
301- "ubuntu:noble" : " maven" ,
302- "ubuntu:focal::arch64" : " maven"
303- },
304298 "java" : {
305299 "debian:10" : " openjdk-11-jdk" ,
306300 "ubuntu:focal" : [
You can’t perform that action at this time.
0 commit comments