You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@apisix.apache.org by we...@apache.org on 2019/11/26 13:24:55 UTC
[incubator-apisix] branch master updated: bugfix: fixed install
deps in makefile. (#904)
This is an automated email from the ASF dual-hosted git repository.
wenming pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-apisix.git
The following commit(s) were added to refs/heads/master by this push:
new a9888b3 bugfix: fixed install deps in makefile. (#904)
a9888b3 is described below
commit a9888b333a053683dd9f205d71bfce89ac977c20
Author: WenMing <mo...@gmail.com>
AuthorDate: Tue Nov 26 21:24:45 2019 +0800
bugfix: fixed install deps in makefile. (#904)
---
.travis/linux_openresty_runner.sh | 2 +-
.travis/linux_tengine_runner.sh | 2 --
Makefile | 7 ++++--
README.md | 44 ++++++++++++++++++++++++------------
README_CN.md | 47 ++++++++++++++++++++++++++++-----------
lua/apisix/core/version.lua | 2 +-
6 files changed, 71 insertions(+), 33 deletions(-)
diff --git a/.travis/linux_openresty_runner.sh b/.travis/linux_openresty_runner.sh
index 251b288..9035252 100755
--- a/.travis/linux_openresty_runner.sh
+++ b/.travis/linux_openresty_runner.sh
@@ -23,7 +23,7 @@ export_or_prefix() {
}
create_lua_deps() {
- WITHOUT_DASHBOARD=1 sudo luarocks make --lua-dir=${OPENRESTY_PREFIX}/luajit rockspec/apisix-master-0.rockspec --tree=deps --only-deps --local
+ sudo luarocks make --lua-dir=${OPENRESTY_PREFIX}/luajit rockspec/apisix-master-0.rockspec --tree=deps --only-deps --local
echo "Create lua deps cache"
sudo rm -rf build-cache/deps
sudo cp -r deps build-cache/
diff --git a/.travis/linux_tengine_runner.sh b/.travis/linux_tengine_runner.sh
index a058667..c7742bd 100755
--- a/.travis/linux_tengine_runner.sh
+++ b/.travis/linux_tengine_runner.sh
@@ -24,7 +24,6 @@ export_or_prefix() {
create_lua_deps() {
sudo luarocks make --lua-dir=${OPENRESTY_PREFIX}/luajit rockspec/apisix-master-0.rockspec --tree=deps --only-deps --local
- sudo luarocks install --lua-dir=${OPENRESTY_PREFIX}/luajit lua-resty-libr3 --tree=deps --local
echo "Create lua deps cache"
sudo rm -rf build-cache/deps
sudo cp -r deps build-cache/
@@ -132,7 +131,6 @@ tengine_install() {
do_install() {
export_or_prefix
- wget -qO - https://openresty.org/package/pubkey.gpg | sudo apt-key add -
sudo apt-get -y update --fix-missing
sudo apt-get -y install software-properties-common
sudo add-apt-repository -y ppa:longsleep/golang-backports
diff --git a/Makefile b/Makefile
index f5ae8e0..074e389 100644
--- a/Makefile
+++ b/Makefile
@@ -28,14 +28,17 @@ LUAROCKS_VER ?= $(shell luarocks --version | grep -E -o "luarocks [0-9]+.")
.PHONY: default
default:
ifeq ($(OR_EXEC), )
- @echo "OpenResty not found. You have to install OpenResty and add the binary file to PATH before install Apache APISIX."
+ifeq ("$(wildcard /usr/local/openresty-debug/bin/openresty)", "")
+ @echo "ERROR: OpenResty not found. You have to install OpenResty and add the binary file to PATH before install Apache APISIX."
exit 1
endif
+endif
+LUTJIT_DIR ?= $(shell ${OR_EXEC} -V 2>&1 | grep prefix | grep -Eo 'prefix=(.*?)/nginx' | grep -Eo '/.*/')luajit
### help: Show Makefile rules.
.PHONY: help
-help:
+help: default
@echo Makefile rules:
@echo
@grep -E '^### [-A-Za-z0-9_]+:' Makefile | sed 's/###/ /'
diff --git a/README.md b/README.md
index 342c3b3..b3b2460 100644
--- a/README.md
+++ b/README.md
@@ -84,9 +84,6 @@ For more detailed information, see the [White Paper](https://www.iresty.com/down
- **[TCP/UDP Proxy](doc/stream-proxy.md)**: Dynamic TCP/UDP proxy.
- **[Dynamic MQTT Proxy](doc/plugins/mqtt-proxy.md)**: Supports to load balance MQTT by `client_id`, both support MQTT [3.1.*](http://docs.oasis-open.org/mqtt/mqtt/v3.1.1/os/mqtt-v3.1.1-os.html), [5.0](https://docs.oasis-open.org/mqtt/mqtt/v5.0/mqtt-v5.0.html).
-## Online Demo Dashboard
-We provide an online dashboard [demo version](http://apisix.iresty.com)， make it easier for you to understand APISIX.
-
## Installation
APISIX Installed and tested in the following systems(OpenResty MUST >= 1.15.8.1, or Tengine >= 2.3.2):
@@ -117,13 +114,28 @@ you can follow the [documentation of limit count](doc/plugins/limit-count.md).
Then you can try more [plugins](doc/README.md#plugins).
## Dashboard
+APISIX has built-in support for dashboards, as follows:
+
+- Download the source code of [dashboard] (https://github.com/apache/incubator-apisix-dashboard):
+```
+git clone https://github.com/apache/incubator-apisix-dashboard.git
+```
-APISIX has the built-in dashboard，open `http://127.0.0.1:9080/apisix/dashboard/` with a browser and try it.
+- Install dependencies and compile
+```
+yarn install
+yarn run build: prod
+```
+- Integration with APISIX
+Copy the compiled files to the apisix / dashboard directory,
+open `http://127.0.0.1:9080/apisix/dashboard/` with a browser and try it.
Do not need to fill the user name and password, log in directly.
Dashboard allow any remote IP by default, and you can modify `allow_admin` in `conf/config.yaml` by yourself, to list the list of IPs allowed to access.
+We provide an online dashboard [demo version](http://apisix.iresty.com), make it easier for you to understand APISIX.
+
## Benchmark
Using AWS's 8 core server, APISIX's QPS reach to 140,000 with a latency of only 0.2 ms.
@@ -140,16 +152,20 @@ Using AWS's 8 core server, APISIX's QPS reach to 140,000 with a latency of only
## Who Uses APISIX?
A wide variety of companies and organizations use APISIX for research, production and commercial product, including:
-1. cunw.com.cn
-1. dasouche.com
-1. fansup.mobi
-1. haieruplus.com
-1. ke.com
-1. meizu.com
-1. taikang.com
-1. tangdou.com
-1. Tencent Cloud
-1. zuzuche.com
+
+1. dasouche 大搜车 https://www.dasouche.com/
+1. ehomepay 理房通 https://www.ehomepay.com.cn/
+1. haieruplus.com 海尔优家 http://haieruplus.com/
+1. HelloTalk, Inc. https://www.hellotalk.com/
+1. ke.com 贝壳找房 https://www.ke.com/
+1. Meizu 魅族 https://www.meizu.com/
+1. NASA JPL 美国国家航空航天局 喷气推进实验室 https://www.jpl.nasa.gov
+1. Netease 网易 http://www.163.com
+1. taikang.com 泰康云 http://taikang.com/
+1. tangdou.com 糖豆网 http://www.tangdou.com/
+1. Tencent Cloud 腾讯云 https://cloud.tencent.com/
+1. Xin 优信二手车 https://www.xin.com/
+1. zuzuche 租租车 https://www.zuzuche.com/
Users are encouraged to add themselves to the [Powered By](doc/powered-by.md) page.
diff --git a/README_CN.md b/README_CN.md
index 965237b..8cd2e7a 100644
--- a/README_CN.md
+++ b/README_CN.md
@@ -26,6 +26,7 @@
- **QQ 交流群**: 552030619
- 邮件列表: 发邮件到 dev-subscribe@apisix.apache.org, 然后跟着回复邮件操作即可
- [](https://gitter.im/apisix/community?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
+
APISIX 是一个云原生、高性能、可扩展的微服务 API 网关。
它是基于 OpenResty 和 etcd 来实现，和传统 API 网关相比，APISIX 具备动态路由和插件热加载，特别适合微服务体系下的 API 管理。
@@ -73,7 +74,7 @@ APISIX 通过插件机制，提供动态负载平衡、身份验证、限流限
- **IPv6**：支持使用 IPv6 格式匹配路由。
- **集群**：APISIX 节点是无状态的，创建配置中心集群请参考 [etcd Clustering Guide](https://github.com/etcd-io/etcd/blob/master/Documentation/v2/clustering.md)。
- **可扩展**：简单易用的插件机制方便扩展。
-- **高性能**：在单核上 QPS 可以达到 24k，同时延迟只有 0.6 毫秒。
+- **高性能**：在单核上 QPS 可以达到 24k，同时延迟只有 0.2 毫秒。
- **防御 ReDoS(正则表达式拒绝服务)**
- **IP 黑名单**
- **IdP 支持**: 支持外部的身份认证服务，比如 Auth0，Okta，Authing 等，用户可以借此来对接 Oauth2.0 等认证方式。
@@ -82,9 +83,6 @@ APISIX 通过插件机制，提供动态负载平衡、身份验证、限流限
- **[TCP/UDP 代理](doc/stream-proxy-cn.md)**: 动态 TCP/UDP 代理。
- **[动态 MQTT 代理](doc/plugins/mqtt-proxy-cn.md)**: 支持用 `client_id` 对 MQTT 进行负载均衡，同时支持 MQTT [3.1.*](http://docs.oasis-open.org/mqtt/mqtt/v3.1.1/os/mqtt-v3.1.1-os.html) 和 [5.0](https://docs.oasis-open.org/mqtt/mqtt/v5.0/mqtt-v5.0.html) 两个协议标准。
-## 在线演示版本
-我们部署了一个在线的 [dashboard](http://apisix.iresty.com) ，方便您了解 APISIX。
-
## 安装
APISIX 在以下操作系统中可顺利安装并做过运行测试，需要注意的是：OpenResty 的版本必须 >= 1.15.8.1：
@@ -114,11 +112,29 @@ sudo apisix start
更进一步，你可以跟着文档来尝试更多的[插件](doc/README_CN.md#插件)。
## 控制台
-APISIX 内置了 dashboard，使用浏览器打开 `http://127.0.0.1:9080/apisix/dashboard/` 即可使用，
+
+APISIX 内置了对 dashboard 的支持，步骤如下：
+
+- 下载 [dashboard](https://github.com/apache/incubator-apisix-dashboard) 的源码：
+```
+git clone https://github.com/apache/incubator-apisix-dashboard.git
+```
+
+- 安装依赖和编译
+```
+yarn install
+yarn run build:prod
+```
+
+- 与 APISIX 集成
+把编译后的文件，拷贝到 apisix/dashboard 目录下。
+使用浏览器打开 `http://127.0.0.1:9080/apisix/dashboard/` 即可使用，
不用填写用户名和密码，直接登录。
Dashboard 默认允许任何 IP 访问。你可以自行修改 `conf/config.yaml` 中的 `allow_admin` 字段，指定允许访问 dashboard 的 IP 列表。
+我们部署了一个在线的 [dashboard](http://apisix.iresty.com) ，方便您了解 APISIX。
+
## 性能测试
使用 AWS 的 8 核心服务器来压测 APISIX，QPS 可以达到 140000，同时延时只有 0.2 毫秒。
@@ -137,14 +153,19 @@ Dashboard 默认允许任何 IP 访问。你可以自行修改 `conf/config.yaml
## APISIX 的用户有哪些？
有很多公司和组织把 APISIX 用户学习、研究、生产环境和商业产品中，包括：
-1. dasouche.com 大搜车
-1. haieruplus.com 海尔优家
-1. ke.com 贝壳找房
-1. meizu.com 魅族
-1. taikang.com 泰康云
-1. tangdou.com 糖豆网
-1. Tencent Cloud 腾讯云
-1. zuzuche.com 租租车
+1. dasouche 大搜车 https://www.dasouche.com/
+1. ehomepay 理房通 https://www.ehomepay.com.cn/
+1. haieruplus.com 海尔优家 http://haieruplus.com/
+1. HelloTalk, Inc. https://www.hellotalk.com/
+1. ke.com 贝壳找房 https://www.ke.com/
+1. Meizu 魅族 https://www.meizu.com/
+1. NASA JPL 美国国家航空航天局 喷气推进实验室 https://www.jpl.nasa.gov
+1. Netease 网易 http://www.163.com
+1. taikang.com 泰康云 http://taikang.com/
+1. tangdou.com 糖豆网 http://www.tangdou.com/
+1. Tencent Cloud 腾讯云 https://cloud.tencent.com/
+1. Xin 优信二手车 https://www.xin.com/
+1. zuzuche 租租车 https://www.zuzuche.com/
欢迎用户把自己加入到 [Powered By](doc/powered-by.md) 页面。
diff --git a/lua/apisix/core/version.lua b/lua/apisix/core/version.lua
index 7ff0b6f..4838aef 100644
--- a/lua/apisix/core/version.lua
+++ b/lua/apisix/core/version.lua
@@ -15,5 +15,5 @@
-- limitations under the License.
--
return {
- VERSION = "0.9-rc1"
+ VERSION = "0.9"
}