From a7d9a85efa9f9abefeb4297ec5fbc5798cc09c25 Mon Sep 17 00:00:00 2001
From: mykola2312 <49044616+mykola2312@users.noreply.github.com>
Date: Sat, 9 Mar 2024 07:23:26 +0200
Subject: [PATCH] implement proper docker compose with database

---
 docker-compose-dev.yml |  9 ---------
 docker-compose.yml     | 22 ++++++++++++++++++++--
 src/bot/bot.rs         |  1 -
 src/main.rs            |  2 +-
 4 files changed, 21 insertions(+), 13 deletions(-)
 delete mode 100644 docker-compose-dev.yml

diff --git a/docker-compose-dev.yml b/docker-compose-dev.yml
deleted file mode 100644
index d5864f5..0000000
--- a/docker-compose-dev.yml
+++ /dev/null
@@ -1,9 +0,0 @@
-services:
-  mk-dl-bot:
-    build: .
-    env_file:
-      - .env
-    volumes:
-      - db:/var/lib/mk-dl-bot
-volumes:
-  db:
\ No newline at end of file
diff --git a/docker-compose.yml b/docker-compose.yml
index d69ac03..ea8417a 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,5 +1,23 @@
 services:
-  mk-dl-bot:
+  postgresdb:
+    image: postgres:alpine
+    env_file:
+      - .env
+    volumes:
+      - db:/var/lib/postgres
+    healthcheck:
+      test: ["CMD", "pg_isready"]
+      interval: 1m30s
+      timeout: 30s
+      retries: 5
+      start_period: 30s
+
+  bot:
     build: .
     env_file:
-      - .env
\ No newline at end of file
+      - .env
+    depends_on:
+      - postgresdb
+    restart: on-failure
+volumes:
+  db:
\ No newline at end of file
diff --git a/src/bot/bot.rs b/src/bot/bot.rs
index 01ae426..edb7bdd 100644
--- a/src/bot/bot.rs
+++ b/src/bot/bot.rs
@@ -130,7 +130,6 @@ enum Command {
 
 async fn cmd_test(bot: Bot, msg: Message, _db: DbPool) -> HandlerResult {
     bot.send_message(msg.chat.id, t!("test_response")).await?;
-    dbg!(msg);
 
     Ok(())
 }
diff --git a/src/main.rs b/src/main.rs
index fea1dde..aaeb505 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -18,7 +18,7 @@ rust_i18n::i18n!("locales");
 #[tokio::main]
 async fn main() -> anyhow::Result<()> {
     if cfg!(debug_assertions) {
-        dotenv().ok();
+        dotenv::from_filename(".env.dev").ok();
     }
 
     log_init();