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 95f2612 CD: auto deploy codes on the master branch to the online demo
(#929)
95f2612 is described below
commit 95f26122fee30d2fcbd18d98433b106c09e9bdca
Author: nic-chen <[email protected]>
AuthorDate: Wed Dec 2 09:40:42 2020 +0800
CD: auto deploy codes on the master branch to the online demo (#929)
* fix: should deploy code in master branch to the online demo
* ci: take a test, should remove pr trigger later
* ci: remove pr trigger
* doc: fix description about build docker image in doc
* fix typo
Co-authored-by: 琚致远 <[email protected]>
---
.github/workflows/deploy-with-docker.yml | 2 +-
docs/deploy-with-docker.md | 4 ++++
docs/deploy-with-docker.zh-CN.md | 3 +++
3 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/.github/workflows/deploy-with-docker.yml
b/.github/workflows/deploy-with-docker.yml
index 8cd08af..5fa7e9d 100644
--- a/.github/workflows/deploy-with-docker.yml
+++ b/.github/workflows/deploy-with-docker.yml
@@ -20,7 +20,7 @@ jobs:
- name: Build Docker Image
run: |
- docker build -t dashboard:ci .
+ docker build -t dashboard:ci . --build-arg
APISIX_DASHBOARD_VERSION=master
- name: Modify ETCD IP
run: |
diff --git a/docs/deploy-with-docker.md b/docs/deploy-with-docker.md
index 1e747bd..185fbef 100644
--- a/docs/deploy-with-docker.md
+++ b/docs/deploy-with-docker.md
@@ -38,6 +38,10 @@ $ docker build -t apisix-dashboard:$tag .
# For users in mainland China, the `ENABLE_PROXY` parameter can be provided to
speed up module downloads.
$ docker build -t apisix-dashboard:$tag . --build-arg ENABLE_PROXY=true
+
+# If you want to use the latest codes to build, you can specify the
`APISIX_DASHBOARD_VERSION` parameter to `master`.
+# This parameter can also be specified as branch name of a specific version,
such as `v2.0`.
+$ docker build -t apisix-dashboard:$tag . --build-arg
APISIX_DASHBOARD_VERSION=master
```
## Launch
diff --git a/docs/deploy-with-docker.zh-CN.md b/docs/deploy-with-docker.zh-CN.md
index 4eecd0f..fb7c362 100644
--- a/docs/deploy-with-docker.zh-CN.md
+++ b/docs/deploy-with-docker.zh-CN.md
@@ -38,6 +38,9 @@ $ docker build -t apisix-dashboard:$tag .
# 对于中国大陆的用户，可启用 `ENABLE_PROXY` 参数加快模块下载速度。
$ docker build -t apisix-dashboard:$tag . --build-arg ENABLE_PROXY=true
+
+# 如果需要使用最新代码构建，可启用 `APISIX_DASHBOARD_VERSION` 参数指定为 `master`
，此参数也可以指定为其他版本的分支名，如 `v2.0` 。
+$ docker build -t apisix-dashboard:$tag . --build-arg
APISIX_DASHBOARD_VERSION=master
```
## 启动
