Move environment variables files to the root

bot-base · Mar 23, 2022 · a1b965b · a1b965b
1 parent 58d87e7
commit a1b965b
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 10 deletions.
diff --git a/.gitignore b/.gitignore
@@ -129,4 +129,4 @@ dist
 # Data
 data/
 
-docker/*.env
+*.env
diff --git a/README.md b/README.md
@@ -28,15 +28,15 @@ Uses PostgreSQL for data storage (MySQL, MongoDB, SQL Server, SQLite [are also s
 
  ```bash
  # development
- cp ./docker/bot.env.example ./docker/bot.dev.env
- cp ./docker/postgres.env.example ./docker/postgres.dev.env
+ cp docker-compose.example.bot.env docker-compose.dev.bot.env
+ cp docker-compose.example.postgres.env docker-compose.dev.postgres.env
 
  # production
- cp ./docker/bot.env.example ./docker/bot.prod.env
- cp ./docker/postgres.env.example ./docker/postgres.prod.env
+ cp docker-compose.example.bot.env docker-compose.prod.bot.env
+ cp docker-compose.example.postgres.env docker-compose.prod.postgres.env
  ```
 
-3. Edit environment variables in `docker/bot.dev.env` and `docker/bot.prod.env`
+3. Edit environment variables in `docker-compose.dev.bot.env` and `docker-compose.prod.bot.env`
 
  **`BOT_TOKEN`** — bot token, **required to change**. Get it from [@BotFather](https://t.me/BotFather). 
  **`BOT_WEBHOOK`** — bot webhook url, **required to change in production**. Used for setup a webhook in production mode. 

diff --git a/docker/bot.env.example → docker-compose.example.bot.env b/docker/bot.env.example → docker-compose.example.bot.env
@@ -1,8 +1,10 @@
 NODE_ENV=development
 LOG_LEVEL=info
 CHECKPOINT_DISABLE=1
+
 DATABASE_URL=postgresql:https://bot:bot@postgres:5432/bot?schema=public
 REDIS_URL=redis:https://redis:6379/0
+
 BOT_SERVER_HOST=0.0.0.0
 BOT_SERVER_PORT=80
 BOT_ALLOWED_UPDATES=[]

diff --git a/docker/postgres.env.example → docker-compose.example.postgres.env b/docker/postgres.env.example → docker-compose.example.postgres.env
diff --git a/docker-compose.override.yml b/docker-compose.override.yml
@@ -7,7 +7,7 @@ services:
  volumes:
  - "postgres-data-dev:/data/postgres"
  env_file:
- - docker/postgres.dev.env
+ - docker-compose.dev.postgres.env
 
  redis:
  ports:
@@ -19,7 +19,7 @@ services:
  volumes:
  - ".:/usr/src"
  env_file:
- - docker/bot.dev.env
+ - docker-compose.dev.bot.env
  command: npm run dev
 
 volumes:

diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml
@@ -5,11 +5,11 @@ services:
  volumes:
  - "postgres-data:/data/postgres"
  env_file:
- - docker/postgres.prod.env
+ - docker-compose.prod.postgres.env
 
  bot:
  env_file:
- - docker/bot.prod.env
+ - docker-compose.prod.bot.env
 
 volumes:
  postgres-data: