This is an automated email from the ASF dual-hosted git repository.
liuxiran pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/apisix-docker.git
The following commit(s) were added to refs/heads/master by this push:
new 0db26d4 ci: execute ci about apisix and dashboard when pull_request
new c7a619d Merge pull request #129 from fukiki/execute_ci_in_pull_request
0db26d4 is described below
commit 0db26d4fb92f5d615ab16432a2b2dc585eabb0c7
Author: fukiki <[email protected]>
AuthorDate: Sun Feb 7 10:50:12 2021 +0800
ci: execute ci about apisix and dashboard when pull_request
Signed-off-by: fukiki <[email protected]>
---
.github/workflows/apisix_all_in_one_ci.yaml | 3 +++
.github/workflows/dashboard_all_in_one_ci.yaml | 3 +++
all-in-one/apisix-dashboard/Dockerfile | 2 +-
3 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/.github/workflows/apisix_all_in_one_ci.yaml
b/.github/workflows/apisix_all_in_one_ci.yaml
index 390c1cf..8aeae32 100644
--- a/.github/workflows/apisix_all_in_one_ci.yaml
+++ b/.github/workflows/apisix_all_in_one_ci.yaml
@@ -4,6 +4,9 @@ on:
push:
branches:
- master
+ pull_request:
+ branches:
+ - master
jobs:
build:
diff --git a/.github/workflows/dashboard_all_in_one_ci.yaml
b/.github/workflows/dashboard_all_in_one_ci.yaml
index cee0cad..4bfb7af 100644
--- a/.github/workflows/dashboard_all_in_one_ci.yaml
+++ b/.github/workflows/dashboard_all_in_one_ci.yaml
@@ -4,6 +4,9 @@ on:
push:
branches:
- master
+ pull_request:
+ branches:
+ - master
jobs:
build:
diff --git a/all-in-one/apisix-dashboard/Dockerfile
b/all-in-one/apisix-dashboard/Dockerfile
index 0084c52..f15c743 100644
--- a/all-in-one/apisix-dashboard/Dockerfile
+++ b/all-in-one/apisix-dashboard/Dockerfile
@@ -124,6 +124,6 @@ RUN mkdir logs
EXPOSE 9080 9443 2379 2380 9000
-CMD ["sh", "-c", "(nohup etcd >/tmp/etcd.log 2>&1 &) && sleep 10 &&
(/usr/local/apisix-dashboard/manager-api &) && /usr/bin/apisix init &&
/usr/bin/apisix init_etcd && /usr/local/openresty/bin/openresty -p
/usr/local/apisix -g 'daemon off;'"]
+CMD ["sh", "-c", "(nohup etcd >/tmp/etcd.log 2>&1 &) && sleep 10 &&
(/usr/local/apisix-dashboard/manager-api &) && cd /usr/local/apisix &&
/usr/bin/apisix init && /usr/bin/apisix init_etcd &&
/usr/local/openresty/bin/openresty -p /usr/local/apisix -g 'daemon off;'"]
STOPSIGNAL SIGQUIT
