From 7b74e6b24dba26f0d54fb67c0789881a17c2dac5 Mon Sep 17 00:00:00 2001 From: Allenxuxu <120582243@qq.com> Date: Wed, 15 Jan 2020 10:24:13 +0800 Subject: [PATCH] update docker-compose --- .gitignore | 2 ++ deployments/docker-compose/.env.example | 1 + deployments/docker-compose/README.md | 8 ++++++++ deployments/docker-compose/docker-compose.yml | 1 - 4 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index ea5c68e..ff475ce 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,5 @@ *.out .idea/ + +deployments/docker-compose/.env diff --git a/deployments/docker-compose/.env.example b/deployments/docker-compose/.env.example index 3be89bf..43399ad 100644 --- a/deployments/docker-compose/.env.example +++ b/deployments/docker-compose/.env.example @@ -3,5 +3,6 @@ #MICRO_REGISTRY=etcd # Set registry address #MICRO_REGISTRY_ADDRESS=MICRO_REGISTRY_ADDRESS:2379 + #DATABASE_URL DATABASE_URL=root:root@(DATABASE_ADDRESS:3306)/xconf?charset=utf8&parseTime=true&loc=Local \ No newline at end of file diff --git a/deployments/docker-compose/README.md b/deployments/docker-compose/README.md index 140f29d..59719ba 100644 --- a/deployments/docker-compose/README.md +++ b/deployments/docker-compose/README.md @@ -1,16 +1,21 @@ # Docker Compose Usage + ## 配置 + 从模板创建配置文件 .env + ```shell script cp .env.example .env ``` 根据自己实际情况配置 + ```shell script ### Registry Config ### # Set registry provider #MICRO_REGISTRY=etcd # Set registry address #MICRO_REGISTRY_ADDRESS=MICRO_REGISTRY_ADDRESS:2379 + #DATABASE_URL DATABASE_URL=root:root@(DATABASE_ADDRESS:3306)/xconf?charset=utf8&parseTime=true&loc=Local ``` @@ -18,8 +23,11 @@ DATABASE_URL=root:root@(DATABASE_ADDRESS:3306)/xconf?charset=utf8&parseTime=true > 如需使用 consul ,请在各个服务中引入 github.com/micro/go-plugins/registry/consul ## 使用 + 启动全部服务 + ```shell script docker-compose up ``` + WEB UI: http://127.0.0.1:8080/admin/ui \ No newline at end of file diff --git a/deployments/docker-compose/docker-compose.yml b/deployments/docker-compose/docker-compose.yml index f80e711..9528547 100644 --- a/deployments/docker-compose/docker-compose.yml +++ b/deployments/docker-compose/docker-compose.yml @@ -33,7 +33,6 @@ services: environment: - MICRO_REGISTRY=${MICRO_REGISTRY} - MICRO_REGISTRY_ADDRESS=${MICRO_REGISTRY_ADDRESS} - - MICRO_API_HANDLER=http networks: - default ports: