This is an automated email from the ASF dual-hosted git repository.
adoroszlai pushed a commit to branch docker-hadoop-2
in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/docker-hadoop-2 by this push:
new b4d330a84ada HADOOP-18970. Upgrade hadoop2 docker scripts to latest
2.10.2 (#6269)
b4d330a84ada is described below
commit b4d330a84ada86df294bfe3c270926a8ca742e8b
Author: Doroszlai, Attila <6454655+adorosz...@users.noreply.github.com>
AuthorDate: Tue Nov 14 17:28:15 2023 +0100
HADOOP-18970. Upgrade hadoop2 docker scripts to latest 2.10.2 (#6269)
---
Dockerfile => .dockerignore | 12 +++++-------
.gitignore | 1 +
Dockerfile | 7 +++++--
build.sh | 6 +++---
config | 3 +++
5 files changed, 17 insertions(+), 12 deletions(-)
diff --git a/Dockerfile b/.dockerignore
similarity index 62%
copy from Dockerfile
copy to .dockerignore
index 282a2ca43cce..fc66d887ed96 100644
--- a/Dockerfile
+++ b/.dockerignore
@@ -13,10 +13,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-FROM apache/hadoop-runner
-ARG
HADOOP_URL=https://www.apache.org/dyn/mirrors/mirrors.cgi?action=download&filename=hadoop/common/hadoop-2.9.0/hadoop-2.9.0.tar.gz
-WORKDIR /opt
-RUN sudo rm -rf /opt/hadoop && wget $HADOOP_URL -O hadoop.tar.gz && tar zxf
hadoop.tar.gz && rm hadoop.tar.gz && mv hadoop* hadoop && rm -rf
/opt/hadoop/share/doc
-WORKDIR /opt/hadoop
-ADD log4j.properties /opt/hadoop/etc/hadoop/log4j.properties
-RUN sudo chown -R hadoop:users /opt/hadoop/etc/hadoop/*
+.git
+.gitignore
+build
+build.sh
+README.md
diff --git a/.gitignore b/.gitignore
index bee8a64b79a9..ce8c7f333ab4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
__pycache__
+build
diff --git a/Dockerfile b/Dockerfile
index 282a2ca43cce..5ac2482b890d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -14,9 +14,12 @@
# limitations under the License.
FROM apache/hadoop-runner
-ARG
HADOOP_URL=https://www.apache.org/dyn/mirrors/mirrors.cgi?action=download&filename=hadoop/common/hadoop-2.9.0/hadoop-2.9.0.tar.gz
+RUN sudo yum install -y which
+ARG
HADOOP_URL=https://www.apache.org/dyn/mirrors/mirrors.cgi?action=download&filename=hadoop/common/hadoop-2.10.2/hadoop-2.10.2.tar.gz
WORKDIR /opt
-RUN sudo rm -rf /opt/hadoop && wget $HADOOP_URL -O hadoop.tar.gz && tar zxf
hadoop.tar.gz && rm hadoop.tar.gz && mv hadoop* hadoop && rm -rf
/opt/hadoop/share/doc
+RUN sudo rm -rf /opt/hadoop && curl -LSs -o hadoop.tar.gz $HADOOP_URL && tar
zxf hadoop.tar.gz && rm hadoop.tar.gz && mv hadoop* hadoop && rm -rf
/opt/hadoop/share/doc
WORKDIR /opt/hadoop
ADD log4j.properties /opt/hadoop/etc/hadoop/log4j.properties
RUN sudo chown -R hadoop:users /opt/hadoop/etc/hadoop/*
+ENV HADOOP_HOME /opt/hadoop
+ENV HADOOP_CONF_DIR $HADOOP_HOME/etc/hadoop
diff --git a/build.sh b/build.sh
index 07e3fb29d357..55ac9a730b37 100755
--- a/build.sh
+++ b/build.sh
@@ -17,11 +17,11 @@
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
set -e
mkdir -p build
-if [ ! -d "$DIR/build/apache-rat-0.12" ]; then
- wget
"https://www.apache.org/dyn/mirrors/mirrors.cgi?action=download&filename=creadur/apache-rat-0.12/apache-rat-0.12-bin.tar.gz";
-O "$DIR/build/apache-rat.tar.gz"
+if [ ! -d "$DIR/build/apache-rat-0.15" ]; then
+ curl -LSs
https://dlcdn.apache.org/creadur/apache-rat-0.15/apache-rat-0.15-bin.tar.gz -o
"$DIR/build/apache-rat.tar.gz"
cd $DIR/build
tar zvxf apache-rat.tar.gz
cd -
fi
-java -jar $DIR/build/apache-rat-0.12/apache-rat-0.12.jar $DIR -e public -e
apache-rat-0.12 -e .git -e .gitignore
+java -jar $DIR/build/apache-rat-0.15/apache-rat-0.15.jar $DIR -e public -e
apache-rat-0.15 -e .git -e .gitignore
docker build -t apache/hadoop:2 .
diff --git a/config b/config
index 907149430a42..7b0629804dbf 100644
--- a/config
+++ b/config
@@ -18,6 +18,9 @@ CORE-SITE.XML_fs.defaultFS=hdfs://namenode
HDFS-SITE.XML_dfs.namenode.rpc-address=namenode:8020
HDFS-SITE.XML_dfs.replication=1
MAPRED-SITE.XML_mapreduce.framework.name=yarn
+MAPRED-SITE.XML_yarn.app.mapreduce.am.env=HADOOP_MAPRED_HOME=$HADOOP_HOME
+MAPRED-SITE.XML_mapreduce.map.env=HADOOP_MAPRED_HOME=$HADOOP_HOME
+MAPRED-SITE.XML_mapreduce.reduce.env=HADOOP_MAPRED_HOME=$HADOOP_HOME
YARN-SITE.XML_yarn.resourcemanager.hostname=resourcemanager
YARN-SITE.XML_yarn.nodemanager.pmem-check-enabled=false
YARN-SITE.XML_yarn.nodemanager.delete.debug-delay-sec=600
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org
For additional commands, e-mail: common-commits-h...@hadoop.apache.org
