Skip to content

Commit

Permalink
CD: auto deploy codes on the master branch to the online demo (#929)
Browse files Browse the repository at this point in the history
* 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: 琚致远 <juzhiyuan@apache.org>
  • Loading branch information
nic-chen and juzhiyuan authored Dec 2, 2020
1 parent 47d67d6 commit 95f2612
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 1 deletion.
2 changes: 1 addition & 1 deletion .github/workflows/deploy-with-docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand Down
4 changes: 4 additions & 0 deletions docs/deploy-with-docker.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 3 additions & 0 deletions docs/deploy-with-docker.zh-CN.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
```

## 启动
Expand Down

0 comments on commit 95f2612

Please sign in to comment.