diff --git a/main_dc/docker-compose.yml b/main_dc/docker-compose.yml index d96b248..365c508 100644 --- a/main_dc/docker-compose.yml +++ b/main_dc/docker-compose.yml @@ -282,6 +282,8 @@ services: environment: APP_PORT: 8787 LOG_LEVEL: info + env_file: + - ./yalarba/api_yal/.env networks: - web-network - app-network diff --git a/main_dc/yalarba/api_yal/.env copy b/main_dc/yalarba/api_yal/.env copy deleted file mode 100644 index 836aa88..0000000 --- a/main_dc/yalarba/api_yal/.env copy +++ /dev/null @@ -1,12 +0,0 @@ -# DB environment variabels -DB_HOST=localhost -DB_PORT=5432 -DB_USER=postgres -DB_PASSWORD=postgres -DB_NAME=mydb -APP_PORT=8080 -JWT_SECRET=secret -UPLOAD_PATH=./storage/uploads -ENVIRONMENT=development -LOG_LEVEL=debug -API_ES_APP_PORT=8088 \ No newline at end of file diff --git a/main_dc/yalarba/api_yal/cmd/main.go b/main_dc/yalarba/api_yal/cmd/main.go index 6d32bce..70002c1 100644 --- a/main_dc/yalarba/api_yal/cmd/main.go +++ b/main_dc/yalarba/api_yal/cmd/main.go @@ -14,6 +14,7 @@ import ( ) func main() { + // Загрузка конфигурации приложения из файлов окружения или конфигурационных файлов // Конфигурация включает параметры БД, уровень логирования, порт приложения и т.д. cfg := config.Load() diff --git a/main_dc/yalarba/api_yal/go.mod b/main_dc/yalarba/api_yal/go.mod index d89ebfa..2c7c2a5 100644 --- a/main_dc/yalarba/api_yal/go.mod +++ b/main_dc/yalarba/api_yal/go.mod @@ -17,6 +17,7 @@ require ( require ( github.com/jinzhu/inflection v1.0.0 // indirect github.com/jinzhu/now v1.1.5 // indirect + github.com/joho/godotenv v1.5.1 go.uber.org/zap v1.27.1 golang.org/x/text v0.21.0 // indirect gorm.io/driver/postgres v1.6.0 diff --git a/main_dc/yalarba/api_yal/go.sum b/main_dc/yalarba/api_yal/go.sum index c50a080..77d625b 100644 --- a/main_dc/yalarba/api_yal/go.sum +++ b/main_dc/yalarba/api_yal/go.sum @@ -11,6 +11,8 @@ github.com/jinzhu/inflection v1.0.0 h1:K317FqzuhWc8YvSVlFMCCUb36O/S9MCKRDI7QkRKD github.com/jinzhu/inflection v1.0.0/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkryuEj+Srlc= github.com/jinzhu/now v1.1.5 h1:/o9tlHleP7gOFmsnYNz3RGnqzefHA47wQpKrrdTIwXQ= github.com/jinzhu/now v1.1.5/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8= +github.com/joho/godotenv v1.5.1 h1:7eLL/+HRGLY0ldzfGMeQkb7vMd0as4CfYvUVzLqw0N0= +github.com/joho/godotenv v1.5.1/go.mod h1:f4LDr5Voq0i2e/R5DDNOoa2zzDfwtkZa6DnEwAbqwq4= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=