[incubator-apisix-dashboard] 01/01: chore(deploy): update deploy dependencies

[ju...@apache.org]

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

juzhiyuan pushed a commit to branch feat-deploy-docs
in repository https://gitbox.apache.org/repos/asf/incubator-apisix-dashboard.git

commit 5ce81acf3aad7f3af53360b65af0215db4586f03
Author: juzhiyuan <ju...@apache.org>
AuthorDate: Sun Jul 12 23:00:01 2020 +0800

    chore(deploy): update deploy dependencies
---
 README.md                                       |  2 +-
 compose/README.md                               | 12 +++---------
 Dockerfile => compose/dashboard_conf/Dockerfile |  8 ++++----
 {docker => compose/dashboard_conf}/nginx.conf   |  0
 compose/docker-compose.yml                      |  2 +-
 5 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/README.md b/README.md
index 97b8f0b..329b739 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
 
 Dashboard for [Apache APISIX](https://github.com/apache/incubator-apisix-dashboard)
 
-## Deploy with Docker (currently)
+## Deploy with Docker (only support currently)
 
 Please refer to [Deploy with Docker README](./compose/README.md)
 
diff --git a/compose/README.md b/compose/README.md
index 7d7c7ce..666fbd9 100644
--- a/compose/README.md
+++ b/compose/README.md
@@ -5,6 +5,7 @@ $ cd incubator-apisix-dashboard/compose
 
 $ chmod +x ./manager_conf/build.sh
 
+# For most users in China, please use some proxy services like https://www.daocloud.io/mirror to speed up your Docker images pulling.
 $ docker-compose -p dashboard up -d
 ```
 
@@ -12,8 +13,7 @@ $ docker-compose -p dashboard up -d
 
 ### 1. login dashboard
 
-Visit `http://127.0.0.1/dashboard/` in the browser, 
-Enter `http://127.0.0.1:8080/apisix/admin` into the first input box, this is the backend management service address
+Visit `http://127.0.0.1/dashboard/` in the browser, Enter `http://127.0.0.1:8080/apisix/admin` into the first input box, this is the backend management service address
 
 ![login](pics/login.png)
 
@@ -46,11 +46,5 @@ Paste shared link
 ![login](pics/grafana_5.png)
 
 save, and you can see the metrics
- 
-![login](pics/grafana_6.png)
- 
-
-
-
-
 
+![login](pics/grafana_6.png)
diff --git a/Dockerfile b/compose/dashboard_conf/Dockerfile
similarity index 70%
rename from Dockerfile
rename to compose/dashboard_conf/Dockerfile
index 8ba7130..de564f8 100644
--- a/Dockerfile
+++ b/compose/dashboard_conf/Dockerfile
@@ -4,17 +4,17 @@ FROM circleci/node:latest-browsers as builder
 WORKDIR /usr/src/app/
 USER root
 
-COPY package.json ./
-COPY yarn.lock ./
+COPY ../../package.json ./
+COPY ../../yarn.lock ./
 RUN yarn
 
-COPY ./ ./
+COPY ../../ ./
 RUN yarn build && rm -rf /usr/src/app/node_modules
 
 # phase-run
 FROM nginx:1.16-alpine
 
-COPY ./docker/nginx.conf /etc/nginx/conf.d/default.conf
+COPY ./nginx.conf /etc/nginx/conf.d/default.conf
 COPY --from=builder /usr/src/app/dist /usr/share/nginx/html/dashboard
 
 EXPOSE 80
diff --git a/docker/nginx.conf b/compose/dashboard_conf/nginx.conf
similarity index 100%
rename from docker/nginx.conf
rename to compose/dashboard_conf/nginx.conf
diff --git a/compose/docker-compose.yml b/compose/docker-compose.yml
index c36495b..52a2f5f 100644
--- a/compose/docker-compose.yml
+++ b/compose/docker-compose.yml
@@ -114,7 +114,7 @@ services:
 
   dashboard:
     build:
-      context: ./..
+      context: ./dashboard_conf
       dockerfile: Dockerfile
     restart: always
     ports: