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 2020/03/19 04:06:11 UTC
[incubator-apisix-docker] branch master updated: bugfix: fixed
docker compose not working (#38)
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-docker.git
The following commit(s) were added to refs/heads/master by this push:
new bd74cdf bugfix: fixed docker compose not working (#38)
bd74cdf is described below
commit bd74cdf20d1eaaa62b59e2589c366c03b9c002f9
Author: Ayeshmantha Perera <ak...@outlook.com>
AuthorDate: Thu Mar 19 05:06:04 2020 +0100
bugfix: fixed docker compose not working (#38)
* fix deprecation logs.
* adding the dn resolver to fix the compose issue.
---
example/apisix_conf/config.yaml | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/example/apisix_conf/config.yaml b/example/apisix_conf/config.yaml
index 9cfdbb2..51028af 100644
--- a/example/apisix_conf/config.yaml
+++ b/example/apisix_conf/config.yaml
@@ -11,10 +11,6 @@ apisix:
# - 127.0.0.0/24 # If we don't set any IP list, then any IP access is allowed by default.
# - "::/64"
# port_admin: 9180 # use a separate port
- real_ip_header: "X-Real-IP" # http://nginx.org/en/docs/http/ngx_http_realip_module.html#real_ip_header
- real_ip_from: # http://nginx.org/en/docs/http/ngx_http_realip_module.html#set_real_ip_from
- - 127.0.0.1
- - 'unix:'
router:
http: 'radixtree_uri' # radixtree_uri: match route by uri(base on radixtree)
# radixtree_host_uri: match route by host + uri(base on radixtree)
@@ -35,6 +31,8 @@ apisix:
- 223.5.5.5
- 1.1.1.1
- 8.8.8.8
+
+ dns_resolver_valid: 30 # valid time for dns result 30 seconds
ssl:
enable: true
@@ -54,6 +52,11 @@ nginx_config: # config for render the template to genarate n
client_header_timeout: 60s # timeout for reading client request header, then 408 (Request Time-out) error is returned to the client
client_body_timeout: 60s # timeout for reading client request body, then 408 (Request Time-out) error is returned to the client
send_timeout: 10s # timeout for transmitting a response to the client.then the connection is closed
+ underscores_in_headers: "on" # default enables the use of underscores in client request header fields
+ real_ip_header: "X-Real-IP" # http://nginx.org/en/docs/http/ngx_http_realip_module.html#real_ip_header
+ real_ip_from: # http://nginx.org/en/docs/http/ngx_http_realip_module.html#set_real_ip_from
+ - 127.0.0.1
+ - 'unix:'
etcd:
host: "http://127.0.0.1:2379" # etcd address