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/11/17 08:39:44 UTC
[apisix-docker] branch release/apisix-2.15.1 updated: move the CI/example's configurations back to V2
This is an automated email from the ASF dual-hosted git repository.
spacewander pushed a commit to branch release/apisix-2.15.1
in repository https://gitbox.apache.org/repos/asf/apisix-docker.git
The following commit(s) were added to refs/heads/release/apisix-2.15.1 by this push:
new 43cd1aa move the CI/example's configurations back to V2
43cd1aa is described below
commit 43cd1aa4aea26ed1c9aad13ede55b2ffdee67867
Author: spacewander <sp...@gmail.com>
AuthorDate: Thu Nov 17 16:38:58 2022 +0800
move the CI/example's configurations back to V2
Signed-off-by: spacewander <sp...@gmail.com>
---
.github/workflows/apisix-docker-example-test.yaml | 2 +-
.github/workflows/apisix_all_in_one_ci.yaml | 4 ++--
.github/workflows/apisix_dev_push_docker_hub.yaml | 2 +-
.github/workflows/apisix_push_docker_hub.yaml | 2 +-
all-in-one/apisix/Dockerfile | 2 +-
all-in-one/apisix/config.yaml | 12 ++----------
compose/apisix_conf/master/config.yaml | 24 +++++++++++------------
compose/apisix_conf/release/config.yaml | 24 +++++++++++------------
compose/docker-compose-master.yaml | 1 -
compose/docker-compose-release.yaml | 1 -
example/docker-compose-arm64.yml | 1 -
11 files changed, 30 insertions(+), 45 deletions(-)
diff --git a/.github/workflows/apisix-docker-example-test.yaml b/.github/workflows/apisix-docker-example-test.yaml
index 082fd89..a69d61a 100644
--- a/.github/workflows/apisix-docker-example-test.yaml
+++ b/.github/workflows/apisix-docker-example-test.yaml
@@ -26,7 +26,7 @@ jobs:
sleep 30
grep -C 3 '\[error\]' example/apisix_log/error.log && exit 1
- curl http://127.0.0.1:9180/apisix/admin/routes/1 \
+ curl http://127.0.0.1:9080/apisix/admin/routes/1 \
-H 'X-API-KEY: edd1c9f034335f136f87ad84b625c8f1' -X PUT -d '
{
"uri": "/get",
diff --git a/.github/workflows/apisix_all_in_one_ci.yaml b/.github/workflows/apisix_all_in_one_ci.yaml
index ba3960a..c71de41 100644
--- a/.github/workflows/apisix_all_in_one_ci.yaml
+++ b/.github/workflows/apisix_all_in_one_ci.yaml
@@ -17,6 +17,6 @@ jobs:
- name: Build and Test
run: |
docker build -t apache/apisix:whole -f ./all-in-one/apisix/Dockerfile .
- docker run -v `pwd`/all-in-one/apisix/config.yaml:/usr/local/apisix/conf/config.yaml -p 9180:9180 -p 9080:9080 -p 2379:2379 --name apisix -d apache/apisix:whole
+ docker run -v `pwd`/all-in-one/apisix/config.yaml:/usr/local/apisix/conf/config.yaml -p 9080:9080 -p 2379:2379 --name apisix -d apache/apisix:whole
sleep 30
- curl http://127.0.0.1:9180/apisix/admin/schema/service -H 'X-API-KEY: edd1c9f034335f136f87ad84b625c8f1'
+ curl http://127.0.0.1:9080/apisix/admin/schema/service -H 'X-API-KEY: edd1c9f034335f136f87ad84b625c8f1'
diff --git a/.github/workflows/apisix_dev_push_docker_hub.yaml b/.github/workflows/apisix_dev_push_docker_hub.yaml
index 38a0399..f9bf8ad 100644
--- a/.github/workflows/apisix_dev_push_docker_hub.yaml
+++ b/.github/workflows/apisix_dev_push_docker_hub.yaml
@@ -34,7 +34,7 @@ jobs:
run: |
grep -C 3 '\[error\]' compose/apisix_log/error.log && exit 1
- curl http://127.0.0.1:9180/apisix/admin/routes/1 \
+ curl http://127.0.0.1:9080/apisix/admin/routes/1 \
-H 'X-API-KEY: edd1c9f034335f136f87ad84b625c8f1' -X PUT -d '
{
"uri": "/get",
diff --git a/.github/workflows/apisix_push_docker_hub.yaml b/.github/workflows/apisix_push_docker_hub.yaml
index 90248ad..bea95be 100644
--- a/.github/workflows/apisix_push_docker_hub.yaml
+++ b/.github/workflows/apisix_push_docker_hub.yaml
@@ -30,7 +30,7 @@ jobs:
run: |
grep -C 3 '\[error\]' compose/apisix_log/error.log && exit 1
- curl http://127.0.0.1:9180/apisix/admin/routes/1 \
+ curl http://127.0.0.1:9080/apisix/admin/routes/1 \
-H 'X-API-KEY: edd1c9f034335f136f87ad84b625c8f1' -X PUT -d '
{
"uri": "/get",
diff --git a/all-in-one/apisix/Dockerfile b/all-in-one/apisix/Dockerfile
index f81a2ac..c35393e 100644
--- a/all-in-one/apisix/Dockerfile
+++ b/all-in-one/apisix/Dockerfile
@@ -37,7 +37,7 @@ WORKDIR /usr/local/apisix
ENV PATH=$PATH:/usr/local/openresty/luajit/bin:/usr/local/openresty/nginx/sbin:/usr/local/openresty/bin
-EXPOSE 9180 9080 9443 2379 2380
+EXPOSE 9080 9443 2379 2380
CMD ["sh", "-c", "(nohup etcd >/tmp/etcd.log 2>&1 &) && sleep 10 && /usr/bin/apisix init && /usr/bin/apisix init_etcd && /usr/local/openresty/bin/openresty -p /usr/local/apisix -g 'daemon off;'"]
diff --git a/all-in-one/apisix/config.yaml b/all-in-one/apisix/config.yaml
index 55caf92..57d72da 100644
--- a/all-in-one/apisix/config.yaml
+++ b/all-in-one/apisix/config.yaml
@@ -18,16 +18,8 @@
apisix:
node_listen: 9080 # APISIX listening port
enable_ipv6: false
-
-deployment:
- admin:
- allow_admin: # http://nginx.org/en/docs/http/ngx_http_access_module.html#allow
- - 0.0.0.0/0 # We need to restrict ip access rules for security. 0.0.0.0/0 is for test.
-
- admin_key:
- - name: "admin"
- key: edd1c9f034335f136f87ad84b625c8f1
- role: admin # admin: manage all configuration data
+ allow_admin: # http://nginx.org/en/docs/http/ngx_http_access_module.html#allow
+ - 0.0.0.0/0 # We need to restrict ip access rules for security. 0.0.0.0/0 is for test.
plugin_attr:
prometheus:
diff --git a/compose/apisix_conf/master/config.yaml b/compose/apisix_conf/master/config.yaml
index 7ddb27d..7a861b3 100644
--- a/compose/apisix_conf/master/config.yaml
+++ b/compose/apisix_conf/master/config.yaml
@@ -18,19 +18,17 @@
apisix:
node_listen: 9080 # APISIX listening port
enable_ipv6: false
+ allow_admin: # http://nginx.org/en/docs/http/ngx_http_access_module.html#allow
+ - 0.0.0.0/0 # We need to restrict ip access rules for security. 0.0.0.0/0 is for test.
-deployment:
- admin:
- allow_admin: # http://nginx.org/en/docs/http/ngx_http_access_module.html#allow
- - 0.0.0.0/0 # We need to restrict ip access rules for security. 0.0.0.0/0 is for test.
+ admin_key:
+ - name: "admin"
+ key: edd1c9f034335f136f87ad84b625c8f1
+ role: admin # admin: manage all configuration data
- admin_key:
- - name: "admin"
- 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
+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
diff --git a/compose/apisix_conf/release/config.yaml b/compose/apisix_conf/release/config.yaml
index 7ddb27d..7a861b3 100644
--- a/compose/apisix_conf/release/config.yaml
+++ b/compose/apisix_conf/release/config.yaml
@@ -18,19 +18,17 @@
apisix:
node_listen: 9080 # APISIX listening port
enable_ipv6: false
+ allow_admin: # http://nginx.org/en/docs/http/ngx_http_access_module.html#allow
+ - 0.0.0.0/0 # We need to restrict ip access rules for security. 0.0.0.0/0 is for test.
-deployment:
- admin:
- allow_admin: # http://nginx.org/en/docs/http/ngx_http_access_module.html#allow
- - 0.0.0.0/0 # We need to restrict ip access rules for security. 0.0.0.0/0 is for test.
+ admin_key:
+ - name: "admin"
+ key: edd1c9f034335f136f87ad84b625c8f1
+ role: admin # admin: manage all configuration data
- admin_key:
- - name: "admin"
- 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
+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
diff --git a/compose/docker-compose-master.yaml b/compose/docker-compose-master.yaml
index 8c3ee8b..6456d7a 100644
--- a/compose/docker-compose-master.yaml
+++ b/compose/docker-compose-master.yaml
@@ -27,7 +27,6 @@ services:
depends_on:
- etcd
ports:
- - "9180:9180/tcp"
- "9080:9080/tcp"
- "9091:9091/tcp"
- "9443:9443/tcp"
diff --git a/compose/docker-compose-release.yaml b/compose/docker-compose-release.yaml
index e85c64e..d354d3a 100644
--- a/compose/docker-compose-release.yaml
+++ b/compose/docker-compose-release.yaml
@@ -27,7 +27,6 @@ services:
depends_on:
- etcd
ports:
- - "9180:9180/tcp"
- "9080:9080/tcp"
- "9091:9091/tcp"
- "9443:9443/tcp"
diff --git a/example/docker-compose-arm64.yml b/example/docker-compose-arm64.yml
index b18e6fa..a664ee9 100644
--- a/example/docker-compose-arm64.yml
+++ b/example/docker-compose-arm64.yml
@@ -37,7 +37,6 @@ services:
depends_on:
- etcd
ports:
- - "9180:9180/tcp"
- "9080:9080/tcp"
- "9091:9091/tcp"
- "9443:9443/tcp"