You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kylin.apache.org by ni...@apache.org on 2020/03/02 02:40:18 UTC
[kylin] branch document updated (c7c847f -> a9fef9f)
This is an automated email from the ASF dual-hosted git repository.
nic pushed a change to branch document
in repository https://gitbox.apache.org/repos/asf/kylin.git.
from c7c847f Change Kylin's slogon to Analytical DW for Big Data
new 21e5e03 update docker document
new a9fef9f update slogan image
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
website/_docs/install/kylin_docker.cn.md | 99 +++------------------
website/_docs/install/kylin_docker.md | 90 ++-----------------
website/_docs31/install/kylin_docker.cn.md | 101 ++++------------------
website/_docs31/install/kylin_docker.md | 90 ++-----------------
website/assets/css/styles.css | 6 +-
website/assets/images/ApacheKylin_Logo_Adjust.png | Bin 249410 -> 0 bytes
website/assets/images/data.jpg | Bin 260392 -> 207284 bytes
website/assets/images/data.png | Bin 211777 -> 158631 bytes
website/assets/images/normal.jpg | Bin 205146 -> 191278 bytes
website/index.cn.md | 8 +-
website/index.md | 4 +-
11 files changed, 56 insertions(+), 342 deletions(-)
delete mode 100644 website/assets/images/ApacheKylin_Logo_Adjust.png
[kylin] 02/02: update slogan image
Posted by ni...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
nic pushed a commit to branch document
in repository https://gitbox.apache.org/repos/asf/kylin.git
commit a9fef9f4fb506ded41b2a93b111cda13e5cb28e6
Author: shaofengshi <sh...@apache.org>
AuthorDate: Sat Feb 29 11:15:45 2020 +0800
update slogan image
---
website/assets/css/styles.css | 6 +++---
website/assets/images/ApacheKylin_Logo_Adjust.png | Bin 249410 -> 0 bytes
website/assets/images/data.jpg | Bin 260392 -> 207284 bytes
website/assets/images/data.png | Bin 211777 -> 158631 bytes
website/assets/images/normal.jpg | Bin 205146 -> 191278 bytes
website/index.cn.md | 8 ++++----
website/index.md | 4 ++--
7 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/website/assets/css/styles.css b/website/assets/css/styles.css
index 37e9642..9b0f473 100644
--- a/website/assets/css/styles.css
+++ b/website/assets/css/styles.css
@@ -132,7 +132,7 @@ a:hover, a:focus {
**********************************************************************/
#head {
- background: #f4f4f4 url(../images/data.png) top center;
+ background: #f4f4f4 url(../images/data.jpg) top center;
background-size: cover;
color: #7C7C7C;
height: 520px;
@@ -231,7 +231,7 @@ a:hover, a:focus {
.navbar {
/*
- background: #f4f4f4 url(../images/data.png) top center;
+ background: #f4f4f4 url(../images/data.jpg) top center;
background-size: cover;
color: #7C7C7C;
height: 100px;
@@ -1158,4 +1158,4 @@ ol.none-icon li{
.aside2 {
padding: 0px 0px 0px 10px;
}
-}
\ No newline at end of file
+}
diff --git a/website/assets/images/ApacheKylin_Logo_Adjust.png b/website/assets/images/ApacheKylin_Logo_Adjust.png
deleted file mode 100644
index 99a60e2..0000000
Binary files a/website/assets/images/ApacheKylin_Logo_Adjust.png and /dev/null differ
diff --git a/website/assets/images/data.jpg b/website/assets/images/data.jpg
index b0aef3e..58de0fd 100644
Binary files a/website/assets/images/data.jpg and b/website/assets/images/data.jpg differ
diff --git a/website/assets/images/data.png b/website/assets/images/data.png
index 0aa1d7f..53fbbab 100644
Binary files a/website/assets/images/data.png and b/website/assets/images/data.png differ
diff --git a/website/assets/images/normal.jpg b/website/assets/images/normal.jpg
index 4ba427f..a5aef01 100644
Binary files a/website/assets/images/normal.jpg and b/website/assets/images/normal.jpg differ
diff --git a/website/index.cn.md b/website/index.cn.md
index 0515005..7258aff 100644
--- a/website/index.cn.md
+++ b/website/index.cn.md
@@ -1,6 +1,6 @@
---
layout: default-cn
-title: 大数据上的OLAP引擎
+title: 大数据分析型数据仓库
---
@@ -53,7 +53,7 @@ title: 大数据上的OLAP引擎
<div class="home-pic">
<img width="30" src="{{"/assets/images/icon_index_olap.png" | prepend: site.baseurl }}">
</div>
- <b>可扩展超快的基于大数据的 OLAP 引擎: </b><br/>
+ <b>可扩展超快的基于大数据的分析型数据仓库: </b><br/>
<div class="indent" style="margin-top: 25px">Kylin 是为减少在 Hadoop/Spark 上百亿规模数据查询延迟而设计</div>
</div>
</div>
@@ -63,7 +63,7 @@ title: 大数据上的OLAP引擎
<img width="30" src="{{"/assets/images/icon_index_hadoop.png" | prepend: site.baseurl }}">
</div>
<b>Hadoop ANSI SQL 接口: </b><br/>
- <div class="indent" style="margin-top: 25px">作为一个 OLAP 引擎，Kylin 为 Hadoop 提供标准 SQL 支持大部分查询功能</div>
+ <div class="indent" style="margin-top: 25px">作为一个分析型数据仓库(也是 OLAP 引擎)，Kylin 为 Hadoop 提供标准 SQL 支持大部分查询功能</div>
</div>
</div>
<div class="col-sm-6 col-md-6">
@@ -348,7 +348,7 @@ title: 大数据上的OLAP引擎
<h6>
<span class="circle-spot">Kylin 核心:</span>
</h6>
- <p>Kylin OLAP引擎基础框架，包括元数据（Metadata）引擎，查询引擎，Job引擎及存储引擎等，同时包括REST服务器以响应客户端请求</p>
+ <p>Kylin 基础框架，包括元数据（Metadata）引擎，查询引擎，Job引擎及存储引擎等，同时包括REST服务器以响应客户端请求</p>
<h6>
<span class="circle-spot">扩展:</span>
</h6>
diff --git a/website/index.md b/website/index.md
index cc6d35b..3681a02 100644
--- a/website/index.md
+++ b/website/index.md
@@ -1,6 +1,6 @@
---
layout: default
-title: OLAP engine for big data
+title: Analytical Data Warehouse for Big Data
---
@@ -74,7 +74,7 @@ title: OLAP engine for big data
<img width="30" src="assets/images/icon_index_hadoop.png">
</div>
<h6><b>ANSI SQL Interface for Big Data on Hadoop</b></h6>
- <div class="indent" style="margin-top: 25px">As an OLAP engine, Kylin offers ANSI SQL on Hadoop/Spark and supports most ANSI SQL query functions.</div>
+ <div class="indent" style="margin-top: 25px">As an Analytical Data Warehouse, Kylin offers ANSI SQL on Hadoop/Spark and supports most ANSI SQL query functions.</div>
</div>
</div>
<div class="col-sm-6 col-md-6">
[kylin] 01/02: update docker document
Posted by ni...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
nic pushed a commit to branch document
in repository https://gitbox.apache.org/repos/asf/kylin.git
commit 21e5e03233e4c95d626280f3eca824cd2c7173ea
Author: shaofengshi <sh...@apache.org>
AuthorDate: Sat Feb 29 11:15:26 2020 +0800
update docker document
---
website/_docs/install/kylin_docker.cn.md | 99 ++++------------------------
website/_docs/install/kylin_docker.md | 90 +++----------------------
website/_docs31/install/kylin_docker.cn.md | 101 +++++------------------------
website/_docs31/install/kylin_docker.md | 90 +++----------------------
4 files changed, 47 insertions(+), 333 deletions(-)
diff --git a/website/_docs/install/kylin_docker.cn.md b/website/_docs/install/kylin_docker.cn.md
index f1995b8..b97d2ae 100644
--- a/website/_docs/install/kylin_docker.cn.md
+++ b/website/_docs/install/kylin_docker.cn.md
@@ -3,19 +3,19 @@ layout: docs
title: "用 Docker 运行 Kylin"
categories: install
permalink: /cn/docs/install/kylin_docker.html
-since: v3.0.0-alpha2
+since: v3.0.0
---
为了让用户方便的试用 Kylin，以及方便开发者在修改了源码后进行验证及调试。我们提供了 Kylin 的 docker 镜像。该镜像中，Kylin 依赖的各个服务均已正确的安装及部署，包括：
-- Jdk 1.8
+- JDK 1.8
- Hadoop 2.7.0
- Hive 1.2.1
-- Hbase 1.1.2
+- HBase 1.1.2
- Spark 2.3.1
- Zookeeper 3.4.6
- Kafka 1.1.1
-- Mysql
+- MySQL 5.1.73
- Maven 3.6.1
## 快速试用 Kylin
@@ -23,7 +23,7 @@ since: v3.0.0-alpha2
我们已将面向用户的 Kylin 镜像上传至 docker 仓库，用户无需在本地构建镜像，直接执行以下命令从 docker 仓库 pull 镜像：
{% highlight Groff markup %}
-docker pull apachekylin/apache-kylin-standalone:3.0.0-alpha2
+docker pull apachekylin/apache-kylin-standalone:3.0.1
{% endhighlight %}
pull 成功后，执行以下命令启动容器：
@@ -36,8 +36,8 @@ docker run -d \
-p 50070:50070 \
-p 8032:8032 \
-p 8042:8042 \
--p 60010:60010 \
-apachekylin/apache-kylin-standalone:3.0.0-alpha2
+-p 16010:16010 \
+apachekylin/apache-kylin-standalone:3.0.1
{% endhighlight %}
在容器启动时，会自动启动以下服务：
@@ -48,86 +48,14 @@ apachekylin/apache-kylin-standalone:3.0.0-alpha2
- Kafka
- Kylin
-并自动运行 `$KYLIN_HOME/bin/sample.sh ` 及在 Kafka 中创建 kylin_streaming_topic topic 并持续向该 topic 中发送数据。这是为了让用户启动容器后，就能体验以批和流的方式的方式构建 Cube 并进行查询。
+并自动运行 `$KYLIN_HOME/bin/sample.sh ` 及在 Kafka 中创建 "kylin_streaming_topic" topic 并持续向该 topic 中发送数据。这是为了让用户启动容器后，就能体验以批和流的方式的方式构建 Cube 并进行查询。
-容器启动后，我们可以通过 docker exec 命令进入容器内。当然，由于我们已经将容器内指定端口映射到本机端口，我们可以直接在本机浏览器中打开各个服务的页面，如：
+容器启动后，我们可以通过 "docker exec -it \<container_id\> bash" 命令进入容器内。当然，由于我们已经将容器内指定端口映射到本机端口，我们可以直接在本机浏览器中打开各个服务的页面，如：
- Kylin 页面：[http://127.0.0.1:7070/kylin/login](http://127.0.0.1:7070/kylin/login)
-- Hdfs NameNode 页面：[http://127.0.0.1:50070](http://127.0.0.1:50070/)
-- Yarn ResourceManager 页面：[http://127.0.0.1:8088](http://127.0.0.1:8088/)
-- HBase 页面：[http://127.0.0.1:60010](http://127.0.0.1:60010/)
-
-容器内，相关环境变量如下：
-
-{% highlight Groff markup %}
-JAVA_HOME=/home/admin/jdk1.8.0_141
-HADOOP_HOME=/home/admin/hadoop-2.7.0
-KAFKA_HOME=/home/admin/kafka_2.11-1.1.1
-SPARK_HOME=/home/admin/spark-2.3.1-bin-hadoop2.6
-HBASE_HOME=/home/admin/hbase-1.1.2
-HIVE_HOME=/home/admin/apache-hive-1.2.1-bin
-KYLIN_HOME=/home/admin/apache-kylin-3.0.0-alpha2-bin-hbase1x
-{% endhighlight %}
-
-## 构建镜像以验证源码修改
-
-当开发者修改了源代码，想要对源代码进行打包、部署及验证时，也可以使用镜像。首先，我们进入源码根目录下的 docker 目录，并执行下面的脚本来构建镜像并将源码拷贝到镜像中：
-
-{% highlight Groff markup %}
-#!/usr/bin/env bash
-
-echo "start build kylin image base on current source code"
-
-rm -rf ./kylin
-mkdir -p ./kylin
-
-echo "start copy kylin source code"
-
-for file in `ls ../../kylin/`
-do
- if [ docker != $file ]
- then
- cp -r ../../kylin/$file ./kylin/
- fi
-done
-
-echo "finish copy kylin source code"
-
-docker build -t apache-kylin-standalone .⏎
-{% endhighlight %}
-
-由于需要通过网络下载各种安装包并进行部署，整个构建过程可能会持续几十分钟，时间长短取决于网络情况。
-
-当完成镜像构建后，执行以下命令启动容器：
-
-{% highlight Groff markup %}
-docker run -d \
--m 8G \
--p 7070:7070 \
--p 8088:8088 \
--p 50070:50070 \
--p 8032:8032 \
--p 8042:8042 \
--p 60010:60010 \
-apache-kylin-standalone
-{% endhighlight %}
-
-当容器启动后，执行 docker exec 命令进入容器。源代码存放在容器的 `/home/admin/kylin_sourcecode` 目录，执行以下命令对源码进行打包：
-
-{% highlight Groff markup %}
-cd /home/admin/kylin_sourcecod
-build/script/package.sh
-{% endhighlight %}
-
-打包完成后，会在 `/home/admin/kylin_sourcecode/dist` 目录下生成一个以 `.tar.gz` 结尾的安装包，如 `apache-kylin-3.0.0-alpha2-bin-hbase1x.tar.gz`。我们可以使用该安装包进行部署和启动 Kylin 服务，如：
-
-{% highlight Groff markup %}
-cp /home/admin/kylin_sourcecode/dist/apache-kylin-3.0.0-alpha2-bin-hbase1x.tar.gz /home/admin
-tar -zxvf /home/admin/apache-kylin-3.0.0-alpha2-bin-hbase1x.tar.gz
-/home/admin/apache-kylin-3.0.0-alpha2-bin-hbase1x/kylin.sh start
-{% endhighlight %}
-
-我们同样可以在本机的浏览器中打开 Hdfs、Yarn、HBase、Kylin 等服务的页面。
+- HDFS NameNode 页面：[http://127.0.0.1:50070](http://127.0.0.1:50070/)
+- YARN ResourceManager 页面：[http://127.0.0.1:8088](http://127.0.0.1:8088/)
+- HBase 页面：[http://127.0.0.1:16010](http://127.0.0.1:16010/)
## 容器资源建议
@@ -140,4 +68,5 @@ tar -zxvf /home/admin/apache-kylin-3.0.0-alpha2-bin-hbase1x.tar.gz
---
-旧版 docker image 请查看 github 项目 [kylin-docker](https://github.com/Kyligence/kylin-docker/).
\ No newline at end of file
+
+关于如何定制修改 Docker image，请参阅 Git 代码库的 [kylin/docker](https://github.com/apache/kylin/tree/master/docker/)
\ No newline at end of file
diff --git a/website/_docs/install/kylin_docker.md b/website/_docs/install/kylin_docker.md
index ee80ab2..58da0bb 100644
--- a/website/_docs/install/kylin_docker.md
+++ b/website/_docs/install/kylin_docker.md
@@ -3,7 +3,7 @@ layout: docs
title: "Run Kylin with Docker"
categories: install
permalink: /docs/install/kylin_docker.html
-since: v3.0.0-alpha2
+since: v3.0.0
---
In order to allow users to easily try Kylin, and to facilitate developers to verify and debug after modifying the source code. We provide Kylin's docker image. In this image, each service that Kylin relies on is properly installed and deployed, including:
@@ -15,7 +15,7 @@ In order to allow users to easily try Kylin, and to facilitate developers to ver
- Spark 2.3.1
- Zookeeper 3.4.6
- Kafka 1.1.1
-- Mysql
+- MySQL 5.1.73
- Maven 3.6.1
## Quickly try Kylin
@@ -23,7 +23,7 @@ In order to allow users to easily try Kylin, and to facilitate developers to ver
We have pushed the Kylin image for the user to the docker hub. Users do not need to build the image locally, just execute the following command to pull the image from the docker hub:
{% highlight Groff markup %}
-docker pull apachekylin/apache-kylin-standalone:3.0.0-alpha2
+docker pull apachekylin/apache-kylin-standalone:3.0.1
{% endhighlight %}
After the pull is successful, execute the following command to start the container:
@@ -36,8 +36,8 @@ docker run -d \
-p 50070:50070 \
-p 8032:8032 \
-p 8042:8042 \
--p 60010:60010 \
-apachekylin/apache-kylin-standalone:3.0.0-alpha2
+-p 16010:16010 \
+apachekylin/apache-kylin-standalone:3.0.1
{% endhighlight %}
The following services are automatically started when the container starts:
@@ -48,86 +48,14 @@ The following services are automatically started when the container starts:
- Kafka
- Kylin
-and run automatically `$KYLIN_HOME/bin/sample.sh `, create a kylin_streaming_topic topic in Kafka and continue to send data to this topic. This is to let the users start the container and then experience the batch and streaming way to build the cube and query.
+and run automatically `$KYLIN_HOME/bin/sample.sh `, create a "kylin_streaming_topic" topic in Kafka and continue to send data to this topic. This is to let the users start the container and then experience the batch and streaming way to build the cube and query.
-After the container is started, we can enter the container through the `docker exec` command. Of course, since we have mapped the specified port in the container to the local port, we can open the pages of each service directly in the native browser, such as:
+After the container is started, we can enter the container through the `docker exec -it <container_id> bash` command. Of course, since we have mapped the specified port in the container to the local port, we can open the pages of each service directly in the native browser, such as:
- Kylin Web UI: [http://127.0.0.1:7070/kylin/login](http://127.0.0.1:7070/kylin/login)
- Hdfs NameNode Web UI: [http://127.0.0.1:50070](http://127.0.0.1:50070/)
- Yarn ResourceManager Web UI: [http://127.0.0.1:8088](http://127.0.0.1:8088/)
-- HBase Web UI: [http://127.0.0.1:60010](http://127.0.0.1:60010/)
-
-In the container, the relevant environment variables are as follows:
-
-{% highlight Groff markup %}
-JAVA_HOME=/home/admin/jdk1.8.0_141
-HADOOP_HOME=/home/admin/hadoop-2.7.0
-KAFKA_HOME=/home/admin/kafka_2.11-1.1.1
-SPARK_HOME=/home/admin/spark-2.3.1-bin-hadoop2.6
-HBASE_HOME=/home/admin/hbase-1.1.2
-HIVE_HOME=/home/admin/apache-hive-1.2.1-bin
-KYLIN_HOME=/home/admin/apache-kylin-3.0.0-alpha2-bin-hbase1x
-{% endhighlight %}
-
-## Build image to verify source code modifications
-
-The docker image can also be used when developers have modified the source code and want to package, deploy, and verify the source code. First, we go to the docker directory under the root directory of the source and execute the script below to build the image and copy the source into the image.:
-
-{% highlight Groff markup %}
-#!/usr/bin/env bash
-
-echo "start build kylin image base on current source code"
-
-rm -rf ./kylin
-mkdir -p ./kylin
-
-echo "start copy kylin source code"
-
-for file in `ls ../../kylin/`
-do
- if [ docker != $file ]
- then
- cp -r ../../kylin/$file ./kylin/
- fi
-done
-
-echo "finish copy kylin source code"
-
-docker build -t apache-kylin-standalone .⏎
-{% endhighlight %}
-
-Due to need to download and deploy various binary packages over the network, the entire build process can last for tens of minutes, depending on the network.
-
-When the image build is complete, execute the following command to start the container:
-
-{% highlight Groff markup %}
-docker run -d \
--m 8G \
--p 7070:7070 \
--p 8088:8088 \
--p 50070:50070 \
--p 8032:8032 \
--p 8042:8042 \
--p 60010:60010 \
-apache-kylin-standalone
-{% endhighlight %}
-
-When the container starts, execute the docker exec command to enter the container. The source code is stored in the container dir `/home/admin/kylin_sourcecode`, execute the following command to package the source code:
-
-{% highlight Groff markup %}
-cd /home/admin/kylin_sourcecod
-build/script/package.sh
-{% endhighlight %}
-
-After the package is complete, an binary package ending in `.tar.gz` will be generated in the `/home/admin/kylin_sourcecode/dist` directory, such as `apache-kylin-3.0.0-alpha2-bin-hbase1x.tar.gz`. We can use this binary package to deploy and launch Kylin services such as:
-
-{% highlight Groff markup %}
-cp /home/admin/kylin_sourcecode/dist/apache-kylin-3.0.0-alpha2-bin-hbase1x.tar.gz /home/admin
-tar -zxvf /home/admin/apache-kylin-3.0.0-alpha2-bin-hbase1x.tar.gz
-/home/admin/apache-kylin-3.0.0-alpha2-bin-hbase1x/kylin.sh start
-{% endhighlight %}
-
-We can also open pages for services such as Hdfs, Yarn, HBase, and Kylin in the browser of this machine.
+- HBase Web UI: [http://127.0.0.1:16010](http://127.0.0.1:16010/)
## Container resource recommendation
@@ -140,4 +68,4 @@ For the resource setting method for the container, please refer to:
---
-For old docker image, please check the github page [kylin-docker](https://github.com/Kyligence/kylin-docker/).
\ No newline at end of file
+For how to customize the image, please check the github page [kylin/docker](https://github.com/apache/kylin/tree/master/docker/).
\ No newline at end of file
diff --git a/website/_docs31/install/kylin_docker.cn.md b/website/_docs31/install/kylin_docker.cn.md
index 4a4bf65..c409a2f 100644
--- a/website/_docs31/install/kylin_docker.cn.md
+++ b/website/_docs31/install/kylin_docker.cn.md
@@ -3,19 +3,19 @@ layout: docs31
title: "用 Docker 运行 Kylin"
categories: install
permalink: /cn/docs31/install/kylin_docker.html
-since: v3.0.0-alpha2
+since: v3.0.0
---
-为了让用户方便的试用 Kylin，以及方便开发者在修改了源码后进行验证及调试。我们提供了 Kylin 的 docker 镜像。该镜像中，Kylin 依赖的各个服务均已正确的安装及部署，包括：
+为了让用户方便的试用Kylin，以及方便开发者在修改了源码后进行验证及调试。我们提供了 Kylin 的 docker 镜像。该镜像中，Kylin 依赖的各个服务均已正确的安装及部署，包括：
-- Jdk 1.8
+- JDK 1.8
- Hadoop 2.7.0
- Hive 1.2.1
-- Hbase 1.1.2
+- HBase 1.1.2
- Spark 2.3.1
- Zookeeper 3.4.6
- Kafka 1.1.1
-- Mysql
+- MySQL 5.1.73
- Maven 3.6.1
## 快速试用 Kylin
@@ -23,7 +23,7 @@ since: v3.0.0-alpha2
我们已将面向用户的 Kylin 镜像上传至 docker 仓库，用户无需在本地构建镜像，直接执行以下命令从 docker 仓库 pull 镜像：
{% highlight Groff markup %}
-docker pull apachekylin/apache-kylin-standalone:3.0.0-alpha2
+docker pull apachekylin/apache-kylin-standalone:3.0.1
{% endhighlight %}
pull 成功后，执行以下命令启动容器：
@@ -36,8 +36,8 @@ docker run -d \
-p 50070:50070 \
-p 8032:8032 \
-p 8042:8042 \
--p 60010:60010 \
-apachekylin/apache-kylin-standalone:3.0.0-alpha2
+-p 16010:16010 \
+apachekylin/apache-kylin-standalone:3.0.1
{% endhighlight %}
在容器启动时，会自动启动以下服务：
@@ -48,86 +48,14 @@ apachekylin/apache-kylin-standalone:3.0.0-alpha2
- Kafka
- Kylin
-并自动运行 `$KYLIN_HOME/bin/sample.sh ` 及在 Kafka 中创建 kylin_streaming_topic topic 并持续向该 topic 中发送数据。这是为了让用户启动容器后，就能体验以批和流的方式的方式构建 Cube 并进行查询。
+并自动运行 `$KYLIN_HOME/bin/sample.sh ` 及在 Kafka 中创建 "kylin_streaming_topic" topic 并持续向该 topic 中发送数据。这是为了让用户启动容器后，就能体验以批和流的方式的方式构建 Cube 并进行查询。
-容器启动后，我们可以通过 docker exec 命令进入容器内。当然，由于我们已经将容器内指定端口映射到本机端口，我们可以直接在本机浏览器中打开各个服务的页面，如：
+容器启动后，我们可以通过 "docker exec -it \<container_id\> bash" 命令进入容器内。当然，由于我们已经将容器内指定端口映射到本机端口，我们可以直接在本机浏览器中打开各个服务的页面，如：
- Kylin 页面：[http://127.0.0.1:7070/kylin/login](http://127.0.0.1:7070/kylin/login)
-- Hdfs NameNode 页面：[http://127.0.0.1:50070](http://127.0.0.1:50070/)
-- Yarn ResourceManager 页面：[http://127.0.0.1:8088](http://127.0.0.1:8088/)
-- HBase 页面：[http://127.0.0.1:60010](http://127.0.0.1:60010/)
-
-容器内，相关环境变量如下：
-
-{% highlight Groff markup %}
-JAVA_HOME=/home/admin/jdk1.8.0_141
-HADOOP_HOME=/home/admin/hadoop-2.7.0
-KAFKA_HOME=/home/admin/kafka_2.11-1.1.1
-SPARK_HOME=/home/admin/spark-2.3.1-bin-hadoop2.6
-HBASE_HOME=/home/admin/hbase-1.1.2
-HIVE_HOME=/home/admin/apache-hive-1.2.1-bin
-KYLIN_HOME=/home/admin/apache-kylin-3.0.0-alpha2-bin-hbase1x
-{% endhighlight %}
-
-## 构建镜像以验证源码修改
-
-当开发者修改了源代码，想要对源代码进行打包、部署及验证时，也可以使用镜像。首先，我们进入源码根目录下的 docker 目录，并执行下面的脚本来构建镜像并将源码拷贝到镜像中：
-
-{% highlight Groff markup %}
-#!/usr/bin/env bash
-
-echo "start build kylin image base on current source code"
-
-rm -rf ./kylin
-mkdir -p ./kylin
-
-echo "start copy kylin source code"
-
-for file in `ls ../../kylin/`
-do
- if [ docker != $file ]
- then
- cp -r ../../kylin/$file ./kylin/
- fi
-done
-
-echo "finish copy kylin source code"
-
-docker build -t apache-kylin-standalone .⏎
-{% endhighlight %}
-
-由于需要通过网络下载各种安装包并进行部署，整个构建过程可能会持续几十分钟，时间长短取决于网络情况。
-
-当完成镜像构建后，执行以下命令启动容器：
-
-{% highlight Groff markup %}
-docker run -d \
--m 8G \
--p 7070:7070 \
--p 8088:8088 \
--p 50070:50070 \
--p 8032:8032 \
--p 8042:8042 \
--p 60010:60010 \
-apache-kylin-standalone
-{% endhighlight %}
-
-当容器启动后，执行 docker exec 命令进入容器。源代码存放在容器的 `/home/admin/kylin_sourcecode` 目录，执行以下命令对源码进行打包：
-
-{% highlight Groff markup %}
-cd /home/admin/kylin_sourcecod
-build/script/package.sh
-{% endhighlight %}
-
-打包完成后，会在 `/home/admin/kylin_sourcecode/dist` 目录下生成一个以 `.tar.gz` 结尾的安装包，如 `apache-kylin-3.0.0-alpha2-bin-hbase1x.tar.gz`。我们可以使用该安装包进行部署和启动 Kylin 服务，如：
-
-{% highlight Groff markup %}
-cp /home/admin/kylin_sourcecode/dist/apache-kylin-3.0.0-alpha2-bin-hbase1x.tar.gz /home/admin
-tar -zxvf /home/admin/apache-kylin-3.0.0-alpha2-bin-hbase1x.tar.gz
-/home/admin/apache-kylin-3.0.0-alpha2-bin-hbase1x/kylin.sh start
-{% endhighlight %}
-
-我们同样可以在本机的浏览器中打开 Hdfs、Yarn、HBase、Kylin 等服务的页面。
+- HDFS NameNode 页面：[http://127.0.0.1:50070](http://127.0.0.1:50070/)
+- YARN ResourceManager 页面：[http://127.0.0.1:8088](http://127.0.0.1:8088/)
+- HBase 页面：[http://127.0.0.1:16010](http://127.0.0.1:16010/)
## 容器资源建议
@@ -140,4 +68,5 @@ tar -zxvf /home/admin/apache-kylin-3.0.0-alpha2-bin-hbase1x.tar.gz
---
-旧版 docker image 请查看 github 项目 [kylin-docker](https://github.com/Kyligence/kylin-docker/).
\ No newline at end of file
+
+关于如何定制修改 Docker image，请参阅 Git 代码库的 [kylin/docker](https://github.com/apache/kylin/tree/master/docker/)
\ No newline at end of file
diff --git a/website/_docs31/install/kylin_docker.md b/website/_docs31/install/kylin_docker.md
index 1cd937f..9847303 100644
--- a/website/_docs31/install/kylin_docker.md
+++ b/website/_docs31/install/kylin_docker.md
@@ -3,7 +3,7 @@ layout: docs31
title: "Run Kylin with Docker"
categories: install
permalink: /docs31/install/kylin_docker.html
-since: v3.0.0-alpha2
+since: v3.0.0
---
In order to allow users to easily try Kylin, and to facilitate developers to verify and debug after modifying the source code. We provide Kylin's docker image. In this image, each service that Kylin relies on is properly installed and deployed, including:
@@ -15,7 +15,7 @@ In order to allow users to easily try Kylin, and to facilitate developers to ver
- Spark 2.3.1
- Zookeeper 3.4.6
- Kafka 1.1.1
-- Mysql
+- MySQL 5.1.73
- Maven 3.6.1
## Quickly try Kylin
@@ -23,7 +23,7 @@ In order to allow users to easily try Kylin, and to facilitate developers to ver
We have pushed the Kylin image for the user to the docker hub. Users do not need to build the image locally, just execute the following command to pull the image from the docker hub:
{% highlight Groff markup %}
-docker pull apachekylin/apache-kylin-standalone:3.0.0-alpha2
+docker pull apachekylin/apache-kylin-standalone:3.0.1
{% endhighlight %}
After the pull is successful, execute the following command to start the container:
@@ -36,8 +36,8 @@ docker run -d \
-p 50070:50070 \
-p 8032:8032 \
-p 8042:8042 \
--p 60010:60010 \
-apachekylin/apache-kylin-standalone:3.0.0-alpha2
+-p 16010:16010 \
+apachekylin/apache-kylin-standalone:3.0.1
{% endhighlight %}
The following services are automatically started when the container starts:
@@ -48,86 +48,14 @@ The following services are automatically started when the container starts:
- Kafka
- Kylin
-and run automatically `$KYLIN_HOME/bin/sample.sh `, create a kylin_streaming_topic topic in Kafka and continue to send data to this topic. This is to let the users start the container and then experience the batch and streaming way to build the cube and query.
+and run automatically `$KYLIN_HOME/bin/sample.sh `, create a "kylin_streaming_topic" topic in Kafka and continue to send data to this topic. This is to let the users start the container and then experience the batch and streaming way to build the cube and query.
-After the container is started, we can enter the container through the `docker exec` command. Of course, since we have mapped the specified port in the container to the local port, we can open the pages of each service directly in the native browser, such as:
+After the container is started, we can enter the container through the `docker exec -it <container_id> bash` command. Of course, since we have mapped the specified port in the container to the local port, we can open the pages of each service directly in the native browser, such as:
- Kylin Web UI: [http://127.0.0.1:7070/kylin/login](http://127.0.0.1:7070/kylin/login)
- Hdfs NameNode Web UI: [http://127.0.0.1:50070](http://127.0.0.1:50070/)
- Yarn ResourceManager Web UI: [http://127.0.0.1:8088](http://127.0.0.1:8088/)
-- HBase Web UI: [http://127.0.0.1:60010](http://127.0.0.1:60010/)
-
-In the container, the relevant environment variables are as follows:
-
-{% highlight Groff markup %}
-JAVA_HOME=/home/admin/jdk1.8.0_141
-HADOOP_HOME=/home/admin/hadoop-2.7.0
-KAFKA_HOME=/home/admin/kafka_2.11-1.1.1
-SPARK_HOME=/home/admin/spark-2.3.1-bin-hadoop2.6
-HBASE_HOME=/home/admin/hbase-1.1.2
-HIVE_HOME=/home/admin/apache-hive-1.2.1-bin
-KYLIN_HOME=/home/admin/apache-kylin-3.0.0-alpha2-bin-hbase1x
-{% endhighlight %}
-
-## Build image to verify source code modifications
-
-The docker image can also be used when developers have modified the source code and want to package, deploy, and verify the source code. First, we go to the docker directory under the root directory of the source and execute the script below to build the image and copy the source into the image.:
-
-{% highlight Groff markup %}
-#!/usr/bin/env bash
-
-echo "start build kylin image base on current source code"
-
-rm -rf ./kylin
-mkdir -p ./kylin
-
-echo "start copy kylin source code"
-
-for file in `ls ../../kylin/`
-do
- if [ docker != $file ]
- then
- cp -r ../../kylin/$file ./kylin/
- fi
-done
-
-echo "finish copy kylin source code"
-
-docker build -t apache-kylin-standalone .⏎
-{% endhighlight %}
-
-Due to need to download and deploy various binary packages over the network, the entire build process can last for tens of minutes, depending on the network.
-
-When the image build is complete, execute the following command to start the container:
-
-{% highlight Groff markup %}
-docker run -d \
--m 8G \
--p 7070:7070 \
--p 8088:8088 \
--p 50070:50070 \
--p 8032:8032 \
--p 8042:8042 \
--p 60010:60010 \
-apache-kylin-standalone
-{% endhighlight %}
-
-When the container starts, execute the docker exec command to enter the container. The source code is stored in the container dir `/home/admin/kylin_sourcecode`, execute the following command to package the source code:
-
-{% highlight Groff markup %}
-cd /home/admin/kylin_sourcecod
-build/script/package.sh
-{% endhighlight %}
-
-After the package is complete, an binary package ending in `.tar.gz` will be generated in the `/home/admin/kylin_sourcecode/dist` directory, such as `apache-kylin-3.0.0-alpha2-bin-hbase1x.tar.gz`. We can use this binary package to deploy and launch Kylin services such as:
-
-{% highlight Groff markup %}
-cp /home/admin/kylin_sourcecode/dist/apache-kylin-3.0.0-alpha2-bin-hbase1x.tar.gz /home/admin
-tar -zxvf /home/admin/apache-kylin-3.0.0-alpha2-bin-hbase1x.tar.gz
-/home/admin/apache-kylin-3.0.0-alpha2-bin-hbase1x/kylin.sh start
-{% endhighlight %}
-
-We can also open pages for services such as Hdfs, Yarn, HBase, and Kylin in the browser of this machine.
+- HBase Web UI: [http://127.0.0.1:16010](http://127.0.0.1:16010/)
## Container resource recommendation
@@ -140,4 +68,4 @@ For the resource setting method for the container, please refer to:
---
-For old docker image, please check the github page [kylin-docker](https://github.com/Kyligence/kylin-docker/).
\ No newline at end of file
+For how to customize the image, please check the github page [kylin/docker](https://github.com/apache/kylin/tree/master/docker/).
\ No newline at end of file