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/29 06:52:34 UTC
[incubator-apisix-dashboard] branch master updated: Fix cd && etcd
image in compose (#285)
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/incubator-apisix-dashboard.git
The following commit(s) were added to refs/heads/master by this push:
new 62e63a0 Fix cd && etcd image in compose (#285)
62e63a0 is described below
commit 62e63a0bf2fc86fb4e58afcc67b426dff3e5e299
Author: kv <gx...@163.com>
AuthorDate: Mon Jun 29 14:52:25 2020 +0800
Fix cd && etcd image in compose (#285)
* modify image name
* fix image name && modify etcd config in compose
* fix image name && modify etcd config in compose
---
.github/workflows/api_cd.yml | 4 ++--
compose/docker-compose.yml | 7 +++++--
2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/.github/workflows/api_cd.yml b/.github/workflows/api_cd.yml
index 9948b4c..a2e0cfb 100644
--- a/.github/workflows/api_cd.yml
+++ b/.github/workflows/api_cd.yml
@@ -19,5 +19,5 @@ jobs:
- run: |
cd ./api
- docker build . -t apisixacr.azurecr.cn/managerApi:${{ github.sha }}
- docker push apisixacr.azurecr.cn/managerApi:${{ github.sha }}
+ docker build . -t apisixacr.azurecr.cn/managerapi:${{ github.sha }}
+ docker push apisixacr.azurecr.cn/managerapi:${{ github.sha }}
diff --git a/compose/docker-compose.yml b/compose/docker-compose.yml
index e4ad481..c2c43a0 100644
--- a/compose/docker-compose.yml
+++ b/compose/docker-compose.yml
@@ -18,13 +18,16 @@ services:
ipv4_address: 192.17.5.11
etcd:
- image: gcr.io/etcd-development/etcd:v3.3.12
- command: /usr/local/bin/etcd --advertise-client-urls http://0.0.0.0:2379 --listen-client-urls http://0.0.0.0:2379
+ image: bitnami/etcd:3.4.9
restart: always
volumes:
- ./etcd_data:/etcd_data
environment:
ETCD_DATA_DIR: /etcd_data
+ ETCD_ENABLE_V2: "true"
+ ALLOW_NONE_AUTHENTICATION: "yes"
+ ETCD_ADVERTISE_CLIENT_URLS: "http://0.0.0.0:2379"
+ ETCD_LISTEN_CLIENT_URLS: "http://0.0.0.0:2379"
ports:
- "2379:2379/tcp"
networks: