You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by el...@apache.org on 2020/11/16 13:02:17 UTC
[hadoop] branch docker-hadoop-3 updated: HADOOP-17320. Update
apache/hadoop:3 to 3.3.0 release (#2415)
This is an automated email from the ASF dual-hosted git repository.
elek pushed a commit to branch docker-hadoop-3
in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/docker-hadoop-3 by this push:
new 8b60d22 HADOOP-17320. Update apache/hadoop:3 to 3.3.0 release (#2415)
8b60d22 is described below
commit 8b60d22a605be2f3a7381f3e681659c86c21209d
Author: Doroszlai, Attila <64...@users.noreply.github.com>
AuthorDate: Mon Nov 16 14:01:50 2020 +0100
HADOOP-17320. Update apache/hadoop:3 to 3.3.0 release (#2415)
---
Dockerfile => .dockerignore | 12 +++++-------
.gitignore | 1 +
Dockerfile | 2 +-
build.sh | 6 +++---
config | 3 +++
5 files changed, 13 insertions(+), 11 deletions(-)
diff --git a/Dockerfile b/.dockerignore
similarity index 62%
copy from Dockerfile
copy to .dockerignore
index 422c6e4..fc66d88 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-3.2.0/hadoop-3.2.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 bee8a64..ce8c7f3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
__pycache__
+build
diff --git a/Dockerfile b/Dockerfile
index 422c6e4..6d93eee 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -14,7 +14,7 @@
# 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-3.2.0/hadoop-3.2.0.tar.gz
+ARG HADOOP_URL=https://www.apache.org/dyn/mirrors/mirrors.cgi?action=download&filename=hadoop/common/hadoop-3.3.0/hadoop-3.3.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
diff --git a/build.sh b/build.sh
index 85aacd5..ec07985 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.13" ]; then
+ wget "https://www.apache.org/dyn/mirrors/mirrors.cgi?action=download&filename=creadur/apache-rat-0.13/apache-rat-0.13-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.13/apache-rat-0.13.jar $DIR -e public -e apache-rat-0.13 -e .git -e .gitignore
docker build -t apache/hadoop:3 .
diff --git a/config b/config
index 9071494..7b06298 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-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org