[apisix-dashboard] branch master updated: chore: Use the original conf/config.yaml + sed to replace `api/test/docker/manager-api-conf.yaml` (#1417)

[ma...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

majunjie pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/apisix-dashboard.git


The following commit(s) were added to refs/heads/master by this push:
     new cd3b7a6  chore: Use the original conf/config.yaml + sed to replace `api/test/docker/manager-api-conf.yaml` (#1417)
cd3b7a6 is described below

commit cd3b7a605c3860ed904780b991fe142049afc575
Author: JinChen <36...@users.noreply.github.com>
AuthorDate: Thu Feb 4 12:09:06 2021 +0800

    chore: Use the original conf/config.yaml + sed to replace `api/test/docker/manager-api-conf.yaml` (#1417)
    
    * chore: use the original conf/config.yaml + sed to replace `api/test/docker/manager-api-conf.yaml`
    
    * Redundant code deletion
    
    The source file will not be affected before a single job, and the redundant code will be deleted
    
    * Modify the back-end-e2e document
    
    * fix error
    
    * Modify document translation
---
 .github/workflows/backend-e2e-test.yml |  7 +++++++
 api/test/docker/docker-compose.yaml    |  2 +-
 docs/back-end-e2e.md                   | 13 +++++++++++++
 3 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/backend-e2e-test.yml b/.github/workflows/backend-e2e-test.yml
index 6bf0fd0..a305f87 100644
--- a/.github/workflows/backend-e2e-test.yml
+++ b/.github/workflows/backend-e2e-test.yml
@@ -20,6 +20,13 @@ jobs:
         with:
           go-version: '1.13'
 
+      - name: Modify conf.yaml Configure for use by the manage-api cluster
+        run: |
+          sed -i 's/127.0.0.1:2379/172.16.238.10:2379/' ./api/conf/conf.yaml
+          sed -i 's/127.0.0.1/0.0.0.0/' ./api/conf/conf.yaml
+          sed -i '/172.16.238.10:2379/a\      - 172.16.238.11:2379' ./api/conf/conf.yaml
+          sed -i '/172.16.238.10:2379/a\      - 172.16.238.12:2379' ./api/conf/conf.yaml
+
       - name: run docker compose
         working-directory: ./api/test/docker
         run: |
diff --git a/api/test/docker/docker-compose.yaml b/api/test/docker/docker-compose.yaml
index 159e26a..8b6f4ff 100644
--- a/api/test/docker/docker-compose.yaml
+++ b/api/test/docker/docker-compose.yaml
@@ -178,7 +178,7 @@ services:
       dockerfile: test/docker/Dockerfile
     restart: always
     volumes:
-      - ./manager-api-conf.yaml:/go/manager-api/conf/conf.yaml:ro
+      - ../../conf/conf.yaml:/go/manager-api/conf/conf.yaml:ro
       - ../testdata:/go/manager-api/testdata
     depends_on:
       - node1
diff --git a/docs/back-end-e2e.md b/docs/back-end-e2e.md
index a1d2362..1dc794f 100644
--- a/docs/back-end-e2e.md
+++ b/docs/back-end-e2e.md
@@ -78,6 +78,19 @@ This document describes how to use E2E test locally.
 
 1. [install docker-compose](https://docs.docker.com/compose/install/)
 
+**NOTE:** In order to run docker compose locally, please change the values of `listen.host` and `etcd.endpoints` within `./api/conf/conf.yaml` as follows:
+
+   ```sh
+   listen:
+      host: 0.0.0.0
+      port: 9000
+   etcd:
+      endpoints:
+        - 172.16.238.10:2379
+        - 172.16.238.11:2379
+        - 172.16.238.12:2379
+   ```
+
 2. Use `docker-compose` to run services such as `manager-api`, `apisix`, `etcd` and `upstream-node`, run the command.
 
    ```sh