You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@apisix.apache.org by sp...@apache.org on 2022/09/27 11:54:28 UTC
[apisix-docker] branch release/apisix-2.99.0 updated (ac15721 -> 6e96c44)
This is an automated email from the ASF dual-hosted git repository.
spacewander pushed a change to branch release/apisix-2.99.0
in repository https://gitbox.apache.org/repos/asf/apisix-docker.git
discard ac15721 fix(ci): compose/apisix_log/error.log can't find
new 6e96c44 fix(ci): compose/apisix_log/error.log can't find
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (ac15721)
\
N -- N -- N refs/heads/release/apisix-2.99.0 (6e96c44)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 1 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:
compose/apisix_conf/release/config.yaml | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
[apisix-docker] 01/01: fix(ci): compose/apisix_log/error.log can't find
Posted by sp...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
spacewander pushed a commit to branch release/apisix-2.99.0
in repository https://gitbox.apache.org/repos/asf/apisix-docker.git
commit 6e96c441d84d1bf7ec3146760d4e80670dc06701
Author: spacewander <sp...@gmail.com>
AuthorDate: Tue Sep 27 18:29:26 2022 +0800
fix(ci): compose/apisix_log/error.log can't find
Signed-off-by: spacewander <sp...@gmail.com>
---
.github/workflows/apisix_push_docker_hub.yaml | 1 +
compose/apisix_conf/release/config.yaml | 11 ++++++-----
2 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/.github/workflows/apisix_push_docker_hub.yaml b/.github/workflows/apisix_push_docker_hub.yaml
index e2888e0..1902dac 100644
--- a/.github/workflows/apisix_push_docker_hub.yaml
+++ b/.github/workflows/apisix_push_docker_hub.yaml
@@ -28,6 +28,7 @@ jobs:
- name: Test route
run: |
+ sleep 30
grep -C 3 '\[error\]' compose/apisix_log/error.log && exit 1
curl http://127.0.0.1:9080/apisix/admin/routes/1 \
diff --git a/compose/apisix_conf/release/config.yaml b/compose/apisix_conf/release/config.yaml
index c302dc0..52973bf 100644
--- a/compose/apisix_conf/release/config.yaml
+++ b/compose/apisix_conf/release/config.yaml
@@ -27,8 +27,9 @@ apisix:
key: edd1c9f034335f136f87ad84b625c8f1
role: admin # admin: manage all configuration data
-etcd:
- host: # it's possible to define multiple etcd hosts addresses of the same etcd cluster.
- - "http://etcd:2379" # multiple etcd address
- prefix: "/apisix" # apisix configurations prefix
- timeout: 30 # 30 seconds
+deployment:
+ etcd:
+ host: # it's possible to define multiple etcd hosts addresses of the same etcd cluster.
+ - "http://etcd:2379" # multiple etcd address
+ prefix: "/apisix" # apisix configurations prefix
+ timeout: 30 # 30 seconds