Merge branch 'master' into v2.0

api/run.sh

@@ -41,17 +41,17 @@ if [[ ! -f "dag-to-lua-1.1/lib/dag-to-lua.lua" ]]; then
 fi
 
 
-# generate json schema
-if [[ ! -f "${pwd}/schema.json" ]]; then
+# generate json schema if need a new one
+if [[ ! -f "${pwd}/api/conf/schema.json" ]]; then
     rm master.zip
     rm -rf ./api/build-tools/apisix/
     wget https://github.com/apache/apisix/archive/master.zip
     unzip master.zip
     mkdir -p ./api/build-tools/apisix/
     mv ./apisix-master/apisix/* ./api/build-tools/apisix/
     rm -rf ./apisix-master
-    cd ./api/build-tools/ && lua schema-sync.lua > ${pwd}/schema.json
-    cd ../../
+    cd ./api/build-tools/ && lua schema-sync.lua > ${pwd}/api/conf/schema.json
+    cd ../../    
 fi
 
 # build

docs/deploy.md

@@ -31,7 +31,9 @@ $ cd apisix-dashboard
 
 The `manager-api` is used to provide APIs for Dashboard, just like a bridge between the Apache APISIX and the Dashboard. Here are the steps to build it manually:
 
-1. We need `Go` 1.13+ and `Lua` 5.1+ to be preinstalled.
+1. We need `Go` 1.13+ to be preinstalled.
+
+NOTE: You also need to install `Lua` 5.1+ if you want to use the Plugin Orchestration, we will improve this part and omit Lua's dependency in the future.
 
 2. Check environment variables
 
@@ -84,4 +86,6 @@ $ yarn build
 ```
 
 5. The bundled files are under `/dist` folder if the step 4 is successful.
+
 6. Visit `http://127.0.0.1:8080` in your browser, `8080` is the default listen port of manager-api.
+

docs/deploy.zh-CN.md

@@ -31,7 +31,9 @@ $ cd apisix-dashboard
 
 `manager-api` 用于为控制台提供接口，就像 Apache APISIX 和控制台之间的桥梁。下面是手动构建步骤：
 
-1. 需要预先安装 `Go` 1.13+ 、`Lua` 5.1+
+1. 需要预先安装 `Go` 1.13+
+
+注意：如果使用插件编排，需要同时预先安装 `Lua` 5.1+ ，后续版本会对此进行优化，取消对 `Lua` 的依赖。
 
 2. 检查环境变量