chore: add local config dir

iyht · Jan 7, 2022 · d55b942 · d55b942
1 parent 2ae1df3
commit d55b942
Show file tree

Hide file tree

Showing 12 changed files with 31 additions and 37 deletions.
diff --git a/.gitignore b/.gitignore
@@ -44,4  44,4 @@ vendor
 
 # custom
 eagle
-config/config.yaml
 config/local/config.yaml
diff --git a/Dockerfile b/Dockerfile
@@ -13,7  13,8 @@ ENV GO111MODULE=on \
     GOOS=linux \
     GOARCH=amd64 \
     GOPROXY="https://goproxy.cn,direct" \
-    TZ=Asia/Shanghai
     TZ=Asia/Shanghai \
     APP_ENV=docer
 
 # 移动到工作目录
 WORKDIR /go/src/github.com/go-eagle/eagle

diff --git a/config/README.md b/config/README.md
diff --git a/config/local/README.md b/config/local/README.md
@@ -0,0  1,27 @@
 # conf
 
 默认从 config/{ENV} 加载配置, 可以通过下面命令生成：
 
 如果是多环境可以设定不同的配置目录，比如：
  - config/local 本地开发环境
  - config/test 测试环境
  - config/staging 预发布环境
  - config/prod 线上环境
 
  > 环境命名参考自：https://cloud.google.com/apis/design/directory_structure
  
  生成测试环境配置文件：
 
  ```bash
 cp -r config/localhost config/test
 ```
 
  使用本地配置文件来运行程序，命令如下:
 
  ```bash
 # 本地启动
 # 也可以直接 APP_ENV={env} ./eagle
 APP_ENV=local ./eagle -c config
 或
 ./eagle -e local -c config
 ```
diff --git a/config/app.yaml → config/local/app.yaml b/config/app.yaml → config/local/app.yaml
diff --git a/config/config.yaml → config/local/config.yaml b/config/config.yaml → config/local/config.yaml
diff --git a/config/database.yaml → config/local/database.yaml b/config/database.yaml → config/local/database.yaml
diff --git a/config/logger.yaml → config/local/logger.yaml b/config/logger.yaml → config/local/logger.yaml
diff --git a/config/nginx_api.conf → config/local/nginx_api.conf b/config/nginx_api.conf → config/local/nginx_api.conf
diff --git a/config/redis.yaml → config/local/redis.yaml b/config/redis.yaml → config/local/redis.yaml
diff --git a/config/trace.yaml → config/local/trace.yaml b/config/trace.yaml → config/local/trace.yaml
diff --git a/go.mod b/go.mod
@@ -34,6  34,7 @@ require (
 	github.com/go-redis/redis/v8 v8.11.0
 	github.com/go-sql-driver/mysql v1.5.0
 	github.com/go-test/deep v1.0.6
 	github.com/golang/protobuf v1.5.2
 	github.com/golang/snappy v0.0.2
 	github.com/google/uuid v1.1.2
 	github.com/gorilla/sessions v1.2.1