From b1e2704a3a7e64661085343ba0e8457cb4c9adcc Mon Sep 17 00:00:00 2001
From: Xiaoyu Yao <xyao@apache.org>
Date: Mon, 16 Oct 2017 23:34:14 -0700
Subject: [PATCH] HDFS-12656. Ozone: dozone: Use (proposed) base image from
 HADOOP-14898. Contributed by Elek, Marton

---
 dev-support/compose/ozone/docker-compose.yaml | 8 ++++----
 dev-support/compose/ozone/docker-config       | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/dev-support/compose/ozone/docker-compose.yaml b/dev-support/compose/ozone/docker-compose.yaml
index cd6420949c..0aa657573f 100644
--- a/dev-support/compose/ozone/docker-compose.yaml
+++ b/dev-support/compose/ozone/docker-compose.yaml
@@ -17,7 +17,7 @@
 version: "3"
 services:
    namenode:
-      image: flokkr/hadoop-runner:latest
+      image: elek/hadoop-runner:latest
       hostname: namenode
       volumes:
          - ../../../hadoop-dist/target/hadoop-${VERSION}:/opt/hadoop
@@ -30,14 +30,14 @@ services:
          - ./docker-config
       command: ["/opt/hadoop/bin/hdfs","namenode"]
    datanode:
-      image: flokkr/hadoop-runner:latest
+      image: elek/hadoop-runner:latest
       volumes:
         - ../../../hadoop-dist/target/hadoop-${VERSION}:/opt/hadoop
       ports:
         - 9864
       command: ["/opt/hadoop/bin/hdfs","datanode"]
    ksm:
-      image: flokkr/hadoop-runner:latest
+      image: elek/hadoop-runner:latest
       volumes:
          - ../../../hadoop-dist/target/hadoop-${VERSION}:/opt/hadoop
       ports:
@@ -46,7 +46,7 @@ services:
           - ./docker-config
       command: ["/opt/hadoop/bin/hdfs","ksm"]
    scm:
-      image: flokkr/hadoop-runner:latest
+      image: elek/hadoop-runner:latest
       volumes:
          - ../../../hadoop-dist/target/hadoop-${VERSION}:/opt/hadoop
       ports:
diff --git a/dev-support/compose/ozone/docker-config b/dev-support/compose/ozone/docker-config
index 5ac0823152..c3f3663b67 100644
--- a/dev-support/compose/ozone/docker-config
+++ b/dev-support/compose/ozone/docker-config
@@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-CORE-SITE.XML_fs.defaultFS: "hdfs://namenode:9000"
+CORE-SITE.XML_fs.defaultFS=hdfs://namenode:9000
 OZONE-SITE.XML_ozone.ksm.address=ksm
 OZONE-SITE.XML_ozone.scm.names=scm
 OZONE-SITE.XML_ozone.enabled=True