diff --git a/hadoop-ozone/dist/src/main/compose/common/hadoop.conf b/hadoop-ozone/dist/src/main/compose/common/hadoop.conf index 2a82c0bfa2f0..ad2d4cb42be6 100644 --- a/hadoop-ozone/dist/src/main/compose/common/hadoop.conf +++ b/hadoop-ozone/dist/src/main/compose/common/hadoop.conf @@ -18,9 +18,6 @@ CORE-SITE.xml_fs.AbstractFileSystem.o3fs.impl=org.apache.hadoop.fs.ozone.OzFs CORE-SITE.xml_fs.AbstractFileSystem.ofs.impl=org.apache.hadoop.fs.ozone.RootedOzFs 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 MAPRED-SITE.XML_mapreduce.map.memory.mb=4096 MAPRED-SITE.XML_mapreduce.reduce.memory.mb=4096 MAPRED-SITE.XML_mapred.child.java.opts=-Xmx2g diff --git a/hadoop-ozone/dist/src/main/compose/ozone-ha/.env b/hadoop-ozone/dist/src/main/compose/ozone-ha/.env index 2de359fc5dbf..6507664fad7f 100644 --- a/hadoop-ozone/dist/src/main/compose/ozone-ha/.env +++ b/hadoop-ozone/dist/src/main/compose/ozone-ha/.env @@ -15,6 +15,7 @@ # limitations under the License. HDDS_VERSION=${hdds.version} +HADOOP_IMAGE=apache/hadoop OZONE_RUNNER_VERSION=${docker.ozone-runner.version} OZONE_RUNNER_IMAGE=apache/ozone-runner OZONE_OPTS= diff --git a/hadoop-ozone/dist/src/main/compose/ozonesecure-mr/.env b/hadoop-ozone/dist/src/main/compose/ozonesecure-mr/.env index 34706093171f..cb5ab1080ace 100644 --- a/hadoop-ozone/dist/src/main/compose/ozonesecure-mr/.env +++ b/hadoop-ozone/dist/src/main/compose/ozonesecure-mr/.env @@ -15,6 +15,7 @@ # limitations under the License. HDDS_VERSION=${hdds.version} +HADOOP_IMAGE=apache/hadoop OZONE_RUNNER_VERSION=${docker.ozone-runner.version} OZONE_RUNNER_IMAGE=apache/ozone-runner OZONE_TESTKRB5_IMAGE=${docker.ozone-testkr5b.image}