You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@apisix.apache.org by ju...@apache.org on 2020/06/12 02:59:28 UTC
[incubator-apisix-dashboard] branch next updated: feat: added
Dashboard dockerfile (#256)
This is an automated email from the ASF dual-hosted git repository.
juzhiyuan pushed a commit to branch next
in repository https://gitbox.apache.org/repos/asf/incubator-apisix-dashboard.git
The following commit(s) were added to refs/heads/next by this push:
new 75084e7 feat: added Dashboard dockerfile (#256)
75084e7 is described below
commit 75084e74ff35b1639781d69c17827b589e2c0e0b
Author: 琚致远 <ju...@apache.org>
AuthorDate: Fri Jun 12 10:59:20 2020 +0800
feat: added Dashboard dockerfile (#256)
* feat: added Dashboard dockerfile
* feat: added Dashboard README
* feat: remove ipv4_address
---
Dockerfile | 4 ++--
README.md => README-dashboard.md | 2 +-
README.md | 46 ++++++----------------------------------
compose/{README.MD => README.md} | 0
compose/docker-compose.yml | 17 ++++++---------
5 files changed, 17 insertions(+), 52 deletions(-)
diff --git a/Dockerfile b/Dockerfile
index b2a51d7..72ac8d3 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -5,10 +5,10 @@ WORKDIR /usr/src/app/
USER root
COPY package.json /usr/src/app/
-RUN npm install --no-cache --production
+RUN yarn
COPY . /usr/src/app/
-RUN npm run build && rm -rf /usr/src/app/node_modules
+RUN yarn build && rm -rf /usr/src/app/node_modules
# phase-run
FROM nginx:1.16-alpine
diff --git a/README.md b/README-dashboard.md
similarity index 96%
copy from README.md
copy to README-dashboard.md
index 7495abf..74f8748 100644
--- a/README.md
+++ b/README-dashboard.md
@@ -1,4 +1,4 @@
-# Apache APISIX Dashboard
+# READMD for Dashboard
This project is initialized with [Ant Design Pro](https://pro.ant.design). Follow is the quick guide for how to use.
diff --git a/README.md b/README.md
index 7495abf..c090b98 100644
--- a/README.md
+++ b/README.md
@@ -1,47 +1,15 @@
# Apache APISIX Dashboard
-This project is initialized with [Ant Design Pro](https://pro.ant.design). Follow is the quick guide for how to use.
+Dashboard for [Apache APISIX](https://github.com/apache/incubator-apisix-dashboard)
-## Environment Prepare
+## Deploy with Docker
-1. Make sure you have `Node.js` installed on your machine.
-2. Install [yarn](https://yarnpkg.com/).
-3. Install `node_modules`:
-
-```bash
-$ yarn
-```
-
-### Start project
-
-```bash
-yarn start:no-mock
-```
-
-### Build project
-
-```bash
-yarn build
-```
-
-### Check code style
-
-```bash
-yarn lint
-```
-
-You can also use script to auto fix some lint error:
-
-```bash
-yarn lint:fix
-```
-
-### Test code
-
-```bash
-yarn test
+```sh
+$ cd /compose
+$ chmod +x ./manager_conf/build.sh
+$ docker-compose -p dashboard up -d
```
## More
-You can view full document on our [official website](https://pro.ant.design). And welcome any feedback in our [github](https://github.com/ant-design/ant-design-pro).
+1. More infomation about the frontend Dashboard, please refer to [README for Dashboard](./README-dashboard.md)
diff --git a/compose/README.MD b/compose/README.md
similarity index 100%
rename from compose/README.MD
rename to compose/README.md
diff --git a/compose/docker-compose.yml b/compose/docker-compose.yml
index c899c8d..3126042 100644
--- a/compose/docker-compose.yml
+++ b/compose/docker-compose.yml
@@ -82,16 +82,13 @@ services:
ipv4_address: 192.17.5.15
- # dashboard:
- # build:
- # context: ./..
- # dockerfile: Dockerfile
- # restart: always
- # ports:
- # - "80:80/tcp"
- # networks:
- # apisix-dashboard:
- # ipv4_address: 192.17.5.16
+ dashboard:
+ build:
+ context: ./..
+ dockerfile: Dockerfile
+ restart: always
+ ports:
+ - "80:80/tcp"
networks:
apisix-dashboard: