You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@apisix.apache.org by bz...@apache.org on 2020/08/22 01:55:22 UTC
[apisix-dashboard] 01/01: Revert "fix(ci): fix preview environment
(#388)"
This is an automated email from the ASF dual-hosted git repository.
bzp2010 pushed a commit to branch revert-388-next-fix-ci-1
in repository https://gitbox.apache.org/repos/asf/apisix-dashboard.git
commit e8506430cb106e804c04d0c3dba8df04d21a5cb0
Author: bzp2010 <bz...@gmail.com>
AuthorDate: Sat Aug 22 09:55:11 2020 +0800
Revert "fix(ci): fix preview environment (#388)"
This reverts commit 622898c0f94affc17917f9dd38b1e46e3a5fb1e1.
---
api/Dockerfile | 2 +-
api/conf.json | 19 +++++++++++++++++++
api/conf/conf_preview.json | 35 -----------------------------------
3 files changed, 20 insertions(+), 36 deletions(-)
diff --git a/api/Dockerfile b/api/Dockerfile
index 264672a..829fb83 100644
--- a/api/Dockerfile
+++ b/api/Dockerfile
@@ -24,7 +24,7 @@ RUN mkdir /root/manager-api \
&& export GOPROXY=https://goproxy.io \
&& go build -o /root/manager-api/manager-api \
&& mv /go/src/github.com/apisix/manager-api/build.sh /root/manager-api/ \
- && mv /go/src/github.com/apisix/manager-api/conf/conf_preview.json /root/manager-api/ \
+ && mv /go/src/github.com/apisix/manager-api/conf.json /root/manager-api/ \
&& rm -rf /go/src/github.com/apisix/manager-api \
&& rm -rf /etc/localtime \
&& ln -s /usr/share/zoneinfo/Hongkong /etc/localtime \
diff --git a/api/conf.json b/api/conf.json
new file mode 100644
index 0000000..31cbcce
--- /dev/null
+++ b/api/conf.json
@@ -0,0 +1,19 @@
+{
+ "conf": {
+ "mysql":{
+ "address": "#mysqlAddress#",
+ "user": "#mysqlUser#",
+ "password": "#mysqlPWD#",
+ "maxConns": 50,
+ "maxIdleConns": 25,
+ "maxLifeTime": 10
+ },
+ "syslog": {
+ "host": "#syslogAddress#"
+ },
+ "apisix": {
+ "base_url": "#apisixBaseUrl#",
+ "api_key": "#apisixApiKey#"
+ }
+ }
+}
diff --git a/api/conf/conf_preview.json b/api/conf/conf_preview.json
deleted file mode 100644
index 6bd791e..0000000
--- a/api/conf/conf_preview.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
- "conf": {
- "mysql": {
- "address": "#mysqlAddress#",
- "user": "#mysqlUser#",
- "password": "#mysqlUser#",
- "maxConns": 50,
- "maxIdleConns": 25,
- "maxLifeTime": 10
- },
- "syslog": {
- "host": "#syslogAddress#"
- },
- "apisix": {
- "base_url": "#apisixBaseUrl#",
- "api_key": "#apisixApiKey#"
- }
- },
- "authentication": {
- "session": {
- "secret": "secret",
- "expireTime": 3600
- },
- "user": [
- {
- "username": "admin",
- "password": "admin"
- },
- {
- "username": "user",
- "password": "user"
- }
- ]
- }
-}