release doc

liu1028 · Jan 15, 2019 · 174a2c2 · 174a2c2
1 parent 2758e61
commit 174a2c2
Show file tree

Hide file tree

Showing 104 changed files with 3,412 additions and 119 deletions.
diff --git a/.gitignore b/.gitignore
@@ -144,7 +144,12 @@ mlsql.master
 
 dev/docker/*.jar
 dev/docker/*.sh
+dev/create-release/*.tar.gz
+dev/create-release/mlsql-spark*
+dev/docker/lib/
 streamingpro-cluster/dev/mlsql-cluster-docker/*.jar
 streamingpro-cluster/dev/mlsql-cluster-docker/*.sh
 streamingpro-cluster/dev/mlsql-cluster-docker/*.yml
+streamingpro-cluster/dev/mlsql-cluster-docker/*.tar.gz
+
 dev/sync-doc.sh
diff --git a/dev/build-docker.sh b/dev/build-docker.sh
@@ -3,26 +3,43 @@
 SELF=$(cd $(dirname $0) && pwd)
 cd $SELF
 
-cd ..
+RELEASE=${RELEASE:-false}
 
-if [[ -z "${MLSQL_VERSION}" ]];then
-MLSQL_VERSION=$(mvn -q \
+if [[ "${RELEASE}" != "true" ]];then
+   cd ..
+   if [[ -z "${MLSQL_VERSION}" ]];then
+    MLSQL_VERSION=$(mvn -q \
     -Dexec.executable=echo \
     -Dexec.args='${project.version}' \
     --non-recursive \
     exec:exec)
+   fi
+
+   export MLSQL_SPARK_VERSION=${MLSQL_SPARK_VERSION:-2.3}
+   export SPARK_VERSION=${SPARK_VERSION:-2.3.2}
+   export MLSQL_DISTRIBUTIOIN_URL="streamingpro-mlsql-spark_${MLSQL_SPARK_VERSION}-${MLSQL_VERSION}.jar"
+   export DISTRIBUTION=${MLSQL_SPARK_VERSION:-false}
+
+   ./dev/package.sh
+   cp streamingpro-mlsql/target/streamingpro-mlsql-spark_${MLSQL_SPARK_VERSION}-${MLSQL_VERSION}.jar ./dev/docker
+
+   cd $SELF
+   docker build --build-arg  MLSQL_VERSION=${MLSQL_VERSION} --build-arg SPARK_VERSION=${SPARK_VERSION} --build-arg MLSQL_SPARK_VERSION=${MLSQL_SPARK_VERSION} -t mlsql:${MLSQL_SPARK_VERSION}-${MLSQL_VERSION} ./docker
+else
+   export MLSQL_VERSION=${MLSQL_VERSION:-1.1.7}
+   export MLSQL_SPARK_VERSION=2.4
+   export SPARK_VERSION=2.4.0
+   docker build --build-arg  MLSQL_VERSION=${MLSQL_VERSION} --build-arg SPARK_VERSION=${SPARK_VERSION} --build-arg MLSQL_SPARK_VERSION=${MLSQL_SPARK_VERSION} -t mlsql:${MLSQL_SPARK_VERSION}-${MLSQL_VERSION} ./docker
+
+   export MLSQL_SPARK_VERSION=2.3
+   export SPARK_VERSION=2.3.2
+   docker build --build-arg  MLSQL_VERSION=${MLSQL_VERSION} --build-arg SPARK_VERSION=${SPARK_VERSION} --build-arg MLSQL_SPARK_VERSION=${MLSQL_SPARK_VERSION} -t mlsql:${MLSQL_SPARK_VERSION}-${MLSQL_VERSION} ./docker
+
+   export MLSQL_SPARK_VERSION=2.2
+   export SPARK_VERSION=2.2.2
+   docker build --build-arg  MLSQL_VERSION=${MLSQL_VERSION} --build-arg SPARK_VERSION=${SPARK_VERSION} --build-arg MLSQL_SPARK_VERSION=${MLSQL_SPARK_VERSION} -t mlsql:${MLSQL_SPARK_VERSION}-${MLSQL_VERSION} ./docker
 fi
 
 
 
-export MLSQL_SPARK_VERSION=${MLSQL_SPARK_VERSION:-2.3}
-export SPARK_VERSION=${SPARK_VERSION:-2.3.2}
-export MLSQL_DISTRIBUTIOIN_URL="streamingpro-mlsql-spark_${MLSQL_SPARK_VERSION}-${MLSQL_VERSION}.jar"
-export DISTRIBUTION=${MLSQL_SPARK_VERSION:-false}
 
-./dev/package.sh
-
-cp streamingpro-mlsql/target/streamingpro-mlsql-spark_${MLSQL_SPARK_VERSION}-${MLSQL_VERSION}.jar ./dev/docker
-
-cd $SELF
-docker build -t mlsql:${MLSQL_SPARK_VERSION}-${MLSQL_VERSION} ./docker
diff --git a/dev/docker/Dockerfile b/dev/docker/Dockerfile
@@ -49,8 +49,10 @@ ENV MAVEN_HOME /usr/share/maven
 ENV MAVEN_CONFIG "$USER_HOME_DIR/.m2"
 
 
-# download spark binary package from mirror
-ENV SPARK_VERSION=2.3.2
+ARG SPARK_VERSION
+ARG MLSQL_SPARK_VERSION
+ARG MLSQL_VERSION
+
 ENV URL_BASE http://www.apache.org/dyn/closer.cgi/
 ENV FILENAME spark-${SPARK_VERSION}-bin-hadoop2.7.tgz
 ENV URL_DIRECTORIES spark/spark-${SPARK_VERSION}/
@@ -71,8 +73,10 @@ RUN mkdir -p /home/deploy/mlsql
 RUN mkdir -p /home/deploy/mlsql-console
 
 RUN mkdir -p /home/deploy/mlsql/libs
-ENV MLSQL_DISTRIBUTIOIN_URL="streamingpro-mlsql-spark_2.3-1.1.7-SNAPSHOT.jar"
+ENV MLSQL_DISTRIBUTIOIN_URL="streamingpro-mlsql-spark_${MLSQL_SPARK_VERSION}-${MLSQL_VERSION}.jar"
 ADD  ${MLSQL_DISTRIBUTIOIN_URL} /home/deploy/mlsql/libs
+ADD  lib/ansj_seg-5.1.6.jar /home/deploy/mlsql/libs
+ADD  lib/nlp-lang-1.7.8.jar /home/deploy/mlsql/libs
 ADD  start-local.sh /home/deploy/mlsql
 WORKDIR /home/deploy/mlsql
 

diff --git a/docs/gitbook/zh/SUMMARY.md b/docs/gitbook/zh/SUMMARY.md
@@ -33,7 +33,8 @@
         * [使用Docker](installation/docker.md)   
         * [如何运行](installation/run.md)
         * [启动参数说明](installation/startup-configuration.md)
-
+        * [使用docker快速体验](installation/docker-fast.md)
+
     * [数据源](datasource/README.md)      
         * [JDBC](datasource/jdbc.md)
         * [ElasticSearch](datasource/es.md)

diff --git a/docs/gitbook/zh/_book/algs/als.html b/docs/gitbook/zh/_book/algs/als.html
@@ -259,6 +259,19 @@
 
 
 
+        </li>
+
+        <li class="chapter " data-level="1.3.1.5" data-path="../installation/docker-fast.html">
+
+                <a href="../installation/docker-fast.html">
+
+
+                    使用docker快速体验
+
+                </a>
+
+
+
         </li>
 
 
@@ -1881,7 +1894,7 @@ <h1 class="search-results-title">No results matching "<span class='search-query'
     <script>
         var gitbook = gitbook || [];
         gitbook.push(function() {
-            gitbook.page.hasChanged({"page":{"title":"ALS","level":"1.3.14.2","depth":3,"next":{"title":"RandomForest","level":"1.3.14.3","depth":3,"path":"algs/random_forest.md","ref":"algs/random_forest.md","articles":[]},"previous":{"title":"NaiveBayes","level":"1.3.14.1","depth":3,"path":"algs/naive_bayes.md","ref":"algs/naive_bayes.md","articles":[]},"dir":"ltr"},"config":{"gitbook":"*","theme":"default","variables":{},"plugins":[],"pluginsConfig":{"highlight":{},"search":{},"lunr":{"maxIndexSize":1000000,"ignoreSpecialCharacters":false},"sharing":{"facebook":true,"twitter":true,"google":false,"weibo":false,"instapaper":false,"vk":false,"all":["facebook","google","twitter","weibo","instapaper"]},"fontsettings":{"theme":"white","family":"sans","size":2},"theme-default":{"styles":{"website":"styles/website.css","pdf":"styles/pdf.css","epub":"styles/epub.css","mobi":"styles/mobi.css","ebook":"styles/ebook.css","print":"styles/print.css"},"showLevel":false}},"structure":{"langs":"LANGS.md","readme":"README.md","glossary":"GLOSSARY.md","summary":"SUMMARY.md"},"pdf":{"pageNumbers":true,"fontSize":12,"fontFamily":"Arial","paperSize":"a4","chapterMark":"pagebreak","pageBreaksBefore":"/","margin":{"right":62,"left":62,"top":56,"bottom":56}},"styles":{"website":"styles/website.css","pdf":"styles/pdf.css","epub":"styles/epub.css","mobi":"styles/mobi.css","ebook":"styles/ebook.css","print":"styles/print.css"}},"file":{"path":"algs/als.md","mtime":"2019-01-13T07:21:55.000Z","type":"markdown"},"gitbook":{"version":"3.2.3","time":"2019-01-14T11:25:22.017Z"},"basePath":"..","book":{"language":""}});
+            gitbook.page.hasChanged({"page":{"title":"ALS","level":"1.3.14.2","depth":3,"next":{"title":"RandomForest","level":"1.3.14.3","depth":3,"path":"algs/random_forest.md","ref":"algs/random_forest.md","articles":[]},"previous":{"title":"NaiveBayes","level":"1.3.14.1","depth":3,"path":"algs/naive_bayes.md","ref":"algs/naive_bayes.md","articles":[]},"dir":"ltr"},"config":{"gitbook":"*","theme":"default","variables":{},"plugins":[],"pluginsConfig":{"highlight":{},"search":{},"lunr":{"maxIndexSize":1000000,"ignoreSpecialCharacters":false},"sharing":{"facebook":true,"twitter":true,"google":false,"weibo":false,"instapaper":false,"vk":false,"all":["facebook","google","twitter","weibo","instapaper"]},"fontsettings":{"theme":"white","family":"sans","size":2},"theme-default":{"styles":{"website":"styles/website.css","pdf":"styles/pdf.css","epub":"styles/epub.css","mobi":"styles/mobi.css","ebook":"styles/ebook.css","print":"styles/print.css"},"showLevel":false}},"structure":{"langs":"LANGS.md","readme":"README.md","glossary":"GLOSSARY.md","summary":"SUMMARY.md"},"pdf":{"pageNumbers":true,"fontSize":12,"fontFamily":"Arial","paperSize":"a4","chapterMark":"pagebreak","pageBreaksBefore":"/","margin":{"right":62,"left":62,"top":56,"bottom":56}},"styles":{"website":"styles/website.css","pdf":"styles/pdf.css","epub":"styles/epub.css","mobi":"styles/mobi.css","ebook":"styles/ebook.css","print":"styles/print.css"}},"file":{"path":"algs/als.md","mtime":"2019-01-13T13:43:13.000Z","type":"markdown"},"gitbook":{"version":"3.2.3","time":"2019-01-15T03:45:11.115Z"},"basePath":"..","book":{"language":""}});
         });
     </script>
 </div>

diff --git a/docs/gitbook/zh/_book/algs/index.html b/docs/gitbook/zh/_book/algs/index.html
@@ -257,6 +257,19 @@
 
 
 
+        </li>
+
+        <li class="chapter " data-level="1.3.1.5" data-path="../installation/docker-fast.html">
+
+                <a href="../installation/docker-fast.html">
+
+
+                    使用docker快速体验
+
+                </a>
+
+
+
         </li>
 
 
@@ -1820,7 +1833,7 @@ <h1 class="search-results-title">No results matching "<span class='search-query'
     <script>
         var gitbook = gitbook || [];
         gitbook.push(function() {
-            gitbook.page.hasChanged({"page":{"title":"MLSQL内置算法","level":"1.3.14","depth":2,"next":{"title":"NaiveBayes","level":"1.3.14.1","depth":3,"path":"algs/naive_bayes.md","ref":"algs/naive_bayes.md","articles":[]},"previous":{"title":"TensorFlow Cluster支持-待写","level":"1.3.13.3","depth":3,"ref":"","articles":[]},"dir":"ltr"},"config":{"gitbook":"*","theme":"default","variables":{},"plugins":[],"pluginsConfig":{"highlight":{},"search":{},"lunr":{"maxIndexSize":1000000,"ignoreSpecialCharacters":false},"sharing":{"facebook":true,"twitter":true,"google":false,"weibo":false,"instapaper":false,"vk":false,"all":["facebook","google","twitter","weibo","instapaper"]},"fontsettings":{"theme":"white","family":"sans","size":2},"theme-default":{"styles":{"website":"styles/website.css","pdf":"styles/pdf.css","epub":"styles/epub.css","mobi":"styles/mobi.css","ebook":"styles/ebook.css","print":"styles/print.css"},"showLevel":false}},"structure":{"langs":"LANGS.md","readme":"README.md","glossary":"GLOSSARY.md","summary":"SUMMARY.md"},"pdf":{"pageNumbers":true,"fontSize":12,"fontFamily":"Arial","paperSize":"a4","chapterMark":"pagebreak","pageBreaksBefore":"/","margin":{"right":62,"left":62,"top":56,"bottom":56}},"styles":{"website":"styles/website.css","pdf":"styles/pdf.css","epub":"styles/epub.css","mobi":"styles/mobi.css","ebook":"styles/ebook.css","print":"styles/print.css"}},"file":{"path":"algs/README.md","mtime":"2019-01-13T07:21:55.000Z","type":"markdown"},"gitbook":{"version":"3.2.3","time":"2019-01-14T11:25:22.017Z"},"basePath":"..","book":{"language":""}});
+            gitbook.page.hasChanged({"page":{"title":"MLSQL内置算法","level":"1.3.14","depth":2,"next":{"title":"NaiveBayes","level":"1.3.14.1","depth":3,"path":"algs/naive_bayes.md","ref":"algs/naive_bayes.md","articles":[]},"previous":{"title":"TensorFlow Cluster支持-待写","level":"1.3.13.3","depth":3,"ref":"","articles":[]},"dir":"ltr"},"config":{"gitbook":"*","theme":"default","variables":{},"plugins":[],"pluginsConfig":{"highlight":{},"search":{},"lunr":{"maxIndexSize":1000000,"ignoreSpecialCharacters":false},"sharing":{"facebook":true,"twitter":true,"google":false,"weibo":false,"instapaper":false,"vk":false,"all":["facebook","google","twitter","weibo","instapaper"]},"fontsettings":{"theme":"white","family":"sans","size":2},"theme-default":{"styles":{"website":"styles/website.css","pdf":"styles/pdf.css","epub":"styles/epub.css","mobi":"styles/mobi.css","ebook":"styles/ebook.css","print":"styles/print.css"},"showLevel":false}},"structure":{"langs":"LANGS.md","readme":"README.md","glossary":"GLOSSARY.md","summary":"SUMMARY.md"},"pdf":{"pageNumbers":true,"fontSize":12,"fontFamily":"Arial","paperSize":"a4","chapterMark":"pagebreak","pageBreaksBefore":"/","margin":{"right":62,"left":62,"top":56,"bottom":56}},"styles":{"website":"styles/website.css","pdf":"styles/pdf.css","epub":"styles/epub.css","mobi":"styles/mobi.css","ebook":"styles/ebook.css","print":"styles/print.css"}},"file":{"path":"algs/README.md","mtime":"2019-01-13T13:43:13.000Z","type":"markdown"},"gitbook":{"version":"3.2.3","time":"2019-01-15T03:45:11.115Z"},"basePath":"..","book":{"language":""}});
         });
     </script>
 </div>

diff --git a/docs/gitbook/zh/_book/algs/lda.html b/docs/gitbook/zh/_book/algs/lda.html
@@ -259,6 +259,19 @@
 
 
 
+        </li>
+
+        <li class="chapter " data-level="1.3.1.5" data-path="../installation/docker-fast.html">
+
+                <a href="../installation/docker-fast.html">
+
+
+                    使用docker快速体验
+
+                </a>
+
+
+
         </li>
 
 
@@ -1888,7 +1901,7 @@ <h1 class="search-results-title">No results matching "<span class='search-query'
     <script>
         var gitbook = gitbook || [];
         gitbook.push(function() {
-            gitbook.page.hasChanged({"page":{"title":"LDA","level":"1.3.14.4","depth":3,"next":{"title":"XGBoost","level":"1.3.14.5","depth":3,"path":"algs/xgboost.md","ref":"algs/xgboost.md","articles":[]},"previous":{"title":"RandomForest","level":"1.3.14.3","depth":3,"path":"algs/random_forest.md","ref":"algs/random_forest.md","articles":[]},"dir":"ltr"},"config":{"gitbook":"*","theme":"default","variables":{},"plugins":[],"pluginsConfig":{"highlight":{},"search":{},"lunr":{"maxIndexSize":1000000,"ignoreSpecialCharacters":false},"sharing":{"facebook":true,"twitter":true,"google":false,"weibo":false,"instapaper":false,"vk":false,"all":["facebook","google","twitter","weibo","instapaper"]},"fontsettings":{"theme":"white","family":"sans","size":2},"theme-default":{"styles":{"website":"styles/website.css","pdf":"styles/pdf.css","epub":"styles/epub.css","mobi":"styles/mobi.css","ebook":"styles/ebook.css","print":"styles/print.css"},"showLevel":false}},"structure":{"langs":"LANGS.md","readme":"README.md","glossary":"GLOSSARY.md","summary":"SUMMARY.md"},"pdf":{"pageNumbers":true,"fontSize":12,"fontFamily":"Arial","paperSize":"a4","chapterMark":"pagebreak","pageBreaksBefore":"/","margin":{"right":62,"left":62,"top":56,"bottom":56}},"styles":{"website":"styles/website.css","pdf":"styles/pdf.css","epub":"styles/epub.css","mobi":"styles/mobi.css","ebook":"styles/ebook.css","print":"styles/print.css"}},"file":{"path":"algs/lda.md","mtime":"2019-01-13T07:21:55.000Z","type":"markdown"},"gitbook":{"version":"3.2.3","time":"2019-01-14T11:25:22.017Z"},"basePath":"..","book":{"language":""}});
+            gitbook.page.hasChanged({"page":{"title":"LDA","level":"1.3.14.4","depth":3,"next":{"title":"XGBoost","level":"1.3.14.5","depth":3,"path":"algs/xgboost.md","ref":"algs/xgboost.md","articles":[]},"previous":{"title":"RandomForest","level":"1.3.14.3","depth":3,"path":"algs/random_forest.md","ref":"algs/random_forest.md","articles":[]},"dir":"ltr"},"config":{"gitbook":"*","theme":"default","variables":{},"plugins":[],"pluginsConfig":{"highlight":{},"search":{},"lunr":{"maxIndexSize":1000000,"ignoreSpecialCharacters":false},"sharing":{"facebook":true,"twitter":true,"google":false,"weibo":false,"instapaper":false,"vk":false,"all":["facebook","google","twitter","weibo","instapaper"]},"fontsettings":{"theme":"white","family":"sans","size":2},"theme-default":{"styles":{"website":"styles/website.css","pdf":"styles/pdf.css","epub":"styles/epub.css","mobi":"styles/mobi.css","ebook":"styles/ebook.css","print":"styles/print.css"},"showLevel":false}},"structure":{"langs":"LANGS.md","readme":"README.md","glossary":"GLOSSARY.md","summary":"SUMMARY.md"},"pdf":{"pageNumbers":true,"fontSize":12,"fontFamily":"Arial","paperSize":"a4","chapterMark":"pagebreak","pageBreaksBefore":"/","margin":{"right":62,"left":62,"top":56,"bottom":56}},"styles":{"website":"styles/website.css","pdf":"styles/pdf.css","epub":"styles/epub.css","mobi":"styles/mobi.css","ebook":"styles/ebook.css","print":"styles/print.css"}},"file":{"path":"algs/lda.md","mtime":"2019-01-13T13:43:13.000Z","type":"markdown"},"gitbook":{"version":"3.2.3","time":"2019-01-15T03:45:11.115Z"},"basePath":"..","book":{"language":""}});
         });
     </script>
 </div>