You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@apisix.apache.org by ch...@apache.org on 2020/11/06 12:03:45 UTC

[apisix-dashboard] branch feat-deploy-with-docker updated (5e092c6 -> 6eb27bc)

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

chenjunxu pushed a change to branch feat-deploy-with-docker
in repository https://gitbox.apache.org/repos/asf/apisix-dashboard.git.


    from 5e092c6  feat: added deploy with docker CD
     add b4b646b  chore: refactor `conf` of `manager api` (#693)
     add edea177  fix:bug that dirty data exists after updating route and wrong mod for prod env (#704)
     add 3a405f7  chore: refactor error log for `manager api` (#689)
     add 3d86a36  Merge branch 'v2.0' into feat-deploy-with-docker
     add 6eb27bc  feat: docker deploy test

No new revisions were added by this update.

Summary of changes:
 .github/workflows/cli_test.yml                     |  31 +++
 .github/workflows/deploy-with-docker.yml           |  31 ++-
 .github/workflows/e2e-test-backend.yml             |  11 +-
 .github/workflows/test-api.yml                     |  25 +--
 Dockerfile                                         |   6 +-
 Makefile                                           |   2 +-
 api/Dockerfile                                     |   8 +-
 api/build.sh                                       |   6 +-
 api/conf/conf.go                                   | 183 +++++++++---------
 api/conf/conf.json                                 |  31 ---
 api/conf/conf.yaml                                 |  39 ++++
 api/conf/conf_preview.json                         |  23 ---
 api/filter/authentication.go                       |   2 +-
 api/filter/logging.go                              |  72 +------
 api/filter/recover.go                              |  15 +-
 api/go.mod                                         |   4 +
 api/go.sum                                         |   8 +
 api/internal/core/store/query.go                   |   4 +-
 api/internal/core/store/store.go                   |  17 +-
 api/internal/core/store/storehub.go                |   3 +
 api/internal/core/store/validate.go                |   5 +
 .../handler/authentication/authentication.go       |   4 +-
 api/internal/handler/route/route.go                |  14 +-
 api/internal/handler/route/route_test.go           | 143 ++++++++++++++
 api/internal/route.go                              |   2 +-
 api/log/log.go                                     | 207 ++++++---------------
 api/log/zap.go                                     |  89 +++++++++
 api/logs/placeholder.txt                           |   0
 api/main.go                                        |  18 +-
 api/run.sh                                         |   3 +-
 api/test/docker-deploy/docker-compose.yaml         |  66 +++++++
 api/test/docker/docker-compose.yaml                |   2 +-
 api/test/docker/manager-api-conf.json              |  31 ---
 api/test/docker/manager-api-conf.yaml              |  43 +++++
 api/test/shell/cli_test.sh                         |  64 +++++++
 docs/deploy-with-docker.md                         |   6 +-
 docs/deploy-with-docker.zh-CN.md                   |   6 +-
 docs/deploy.md                                     |  51 ++---
 docs/deploy.zh-CN.md                               |  51 ++---
 docs/examples/docker-conf-example.json             |  31 ---
 .../examples/docker-conf-example.yaml              |  28 ++-
 41 files changed, 817 insertions(+), 568 deletions(-)
 create mode 100644 .github/workflows/cli_test.yml
 delete mode 100644 api/conf/conf.json
 create mode 100644 api/conf/conf.yaml
 delete mode 100644 api/conf/conf_preview.json
 create mode 100644 api/log/zap.go
 create mode 100644 api/logs/placeholder.txt
 create mode 100644 api/test/docker-deploy/docker-compose.yaml
 delete mode 100644 api/test/docker/manager-api-conf.json
 create mode 100644 api/test/docker/manager-api-conf.yaml
 create mode 100755 api/test/shell/cli_test.sh
 delete mode 100644 docs/examples/docker-conf-example.json
 rename api/docker-compose.yml => docs/examples/docker-conf-example.yaml (65%)