You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@griffin.apache.org by gu...@apache.org on 2018/09/14 02:30:06 UTC
incubator-griffin git commit: update docker document for zookeeper
image unaccessable in china
Repository: incubator-griffin
Updated Branches:
refs/heads/master b5360ec70 -> 9a39da738
update docker document for zookeeper image unaccessable in china
Author: Lionel Liu <bh...@163.com>
Closes #408 from bhlx3lyx7/docker-doc.
Project: http://git-wip-us.apache.org/repos/asf/incubator-griffin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-griffin/commit/9a39da73
Tree: http://git-wip-us.apache.org/repos/asf/incubator-griffin/tree/9a39da73
Diff: http://git-wip-us.apache.org/repos/asf/incubator-griffin/diff/9a39da73
Branch: refs/heads/master
Commit: 9a39da7386c59dbb6e7ddb53215d2975f3407d7c
Parents: b5360ec
Author: Lionel Liu <bh...@163.com>
Authored: Fri Sep 14 10:29:59 2018 +0800
Committer: William Guo <gu...@apache.org>
Committed: Fri Sep 14 10:29:59 2018 +0800
----------------------------------------------------------------------
griffin-doc/docker/griffin-docker-guide.md | 2 +-
service/src/main/resources/banner.txt | 2 +-
service/src/main/resources/sparkProperties.json | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/9a39da73/griffin-doc/docker/griffin-docker-guide.md
----------------------------------------------------------------------
diff --git a/griffin-doc/docker/griffin-docker-guide.md b/griffin-doc/docker/griffin-docker-guide.md
index c9fe150..6ac3775 100644
--- a/griffin-doc/docker/griffin-docker-guide.md
+++ b/griffin-doc/docker/griffin-docker-guide.md
@@ -45,7 +45,7 @@ Griffin docker images are pre-built on docker hub, users can pull them to try gr
docker pull registry.docker-cn.com/apachegriffin/griffin_spark2:0.3.0
docker pull registry.docker-cn.com/apachegriffin/elasticsearch
docker pull registry.docker-cn.com/apachegriffin/kafka
- docker pull registry.docker-cn.com/zookeeper:3.5
+ docker pull zookeeper:3.5
```
The docker images are the griffin environment images.
- `apachegriffin/griffin_spark2`: This image contains mysql, hadoop, hive, spark, livy, griffin service, griffin measure, and some prepared demo data, it works as a single node spark cluster, providing spark engine and griffin service.
http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/9a39da73/service/src/main/resources/banner.txt
----------------------------------------------------------------------
diff --git a/service/src/main/resources/banner.txt b/service/src/main/resources/banner.txt
index fa2c8c0..1546074 100644
--- a/service/src/main/resources/banner.txt
+++ b/service/src/main/resources/banner.txt
@@ -2,4 +2,4 @@ _________________ _________________________________________ __
__ ____/___ __ \____ _/___ ____/___ ____/____ _/___ | / /
_ / __ __ /_/ / __ / __ /_ __ /_ __ / __ |/ /
/ /_/ / _ _, _/ __/ / _ __/ _ __/ __/ / _ /| /
-\____/ /_/ |_| /___/ /_/ /_/ /___/ /_/ |_/ version: 0.2.0
+\____/ /_/ |_| /___/ /_/ /_/ /___/ /_/ |_/ version: 0.3.0
http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/9a39da73/service/src/main/resources/sparkProperties.json
----------------------------------------------------------------------
diff --git a/service/src/main/resources/sparkProperties.json b/service/src/main/resources/sparkProperties.json
index 15c015d..8fb023c 100644
--- a/service/src/main/resources/sparkProperties.json
+++ b/service/src/main/resources/sparkProperties.json
@@ -3,7 +3,7 @@
"className": "org.apache.griffin.measure.Application",
"name": "griffin",
"queue": "default",
- "numExecutors": 3,
+ "numExecutors": 2,
"executorCores": 1,
"driverMemory": "1g",
"executorMemory": "1g",