[apisix-dashboard] branch master updated: fix(ci): fix preview environment (#388)

[ju...@apache.org]

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

juzhiyuan 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 622898c  fix(ci): fix preview environment (#388)
622898c is described below

commit 622898c0f94affc17917f9dd38b1e46e3a5fb1e1
Author: bzp2010 <bz...@gmail.com>
AuthorDate: Sat Aug 22 09:54:15 2020 +0800

    fix(ci): fix preview environment (#388)
---
 api/Dockerfile             |  2 +-
 api/conf.json              | 19 -------------------
 api/conf/conf_preview.json | 35 +++++++++++++++++++++++++++++++++++
 3 files changed, 36 insertions(+), 20 deletions(-)

diff --git a/api/Dockerfile b/api/Dockerfile
index 829fb83..264672a 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.json /root/manager-api/ \
+    && mv /go/src/github.com/apisix/manager-api/conf/conf_preview.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
deleted file mode 100644
index 31cbcce..0000000
--- a/api/conf.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "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
new file mode 100644
index 0000000..6bd791e
--- /dev/null
+++ b/api/conf/conf_preview.json
@@ -0,0 +1,35 @@
+{
+  "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"
+      }
+    ]
+  }
+}