From 08ebe2dbb8ec6909ab3dc4a1c2876966cc353d67 Mon Sep 17 00:00:00 2001
From: Denis <denok629@gmail.com>
Date: Thu, 18 May 2023 09:01:18 +0300
Subject: [PATCH] change docker-compose

---
 docker-compose.yml                            | 33 ++++++++++++-------
 .../internal/dbManager/src/dbConnection.cpp   |  2 +-
 server/internal/dbManager/src/dbManager.cpp   |  2 +-
 server/internal/httpServer/main.cpp           |  4 ++-
 server/internal/httpServer/src/Router.cpp     |  2 +-
 5 files changed, 28 insertions(+), 15 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 1f9cc2a..b4df00d 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -4,27 +4,38 @@ volumes:
   database-volume:
 
 services:
-  postgres:
+  db:
+    image: postgres
+    container_name: db
+    restart: always
     build:
       context: ./Docker
       dockerfile: db.Dockerfile
-    restart: always
-    image: postgres
     environment:
-      POSTGRES_DB: "tmp"
-      POSTGRES_USER: "tmp"
-      POSTGRES_PASSWORD: "tmp"
+      POSTGRES_DB: "temp"
+      POSTGRES_USER: "temp"
+      POSTGRES_PASSWORD: "temp"
+    volumes:
+      - database-volume:/var/lib/postgresql/data  
     ports:
       - "5432:5432"
-    volumes:
-      - database-volume:/var/lib/postgresql/data
+    networks:
+      - db-network  
   server:
     image: raiden454/cpp-app:latest
+    networks:
+      - db-network
     volumes:
       - .:/project
     command: make server-run
-    restart: always
     ports:
-      - "8081:8081"
+      - "8080:8080"
     depends_on:
-      - postgres
+      - db
+    links:
+      - db:db  
+    
+networks:
+  db-network:
+    driver: bridge
+    name: db_network
diff --git a/server/internal/dbManager/src/dbConnection.cpp b/server/internal/dbManager/src/dbConnection.cpp
index e89f6e7..dc44025 100644
--- a/server/internal/dbManager/src/dbConnection.cpp
+++ b/server/internal/dbManager/src/dbConnection.cpp
@@ -14,7 +14,7 @@ std::shared_ptr<pqxx::connection> dbConnection::connection() const {
 }
 
 void dbConnection::establish_connection() {
-    pqxx::connection c("dbname =mydb" "user = postgres password =root hostaddr =127.0.0.1 port = 5432");
+    pqxx::connection c("dbname =mydb" "user = temp password =temp hostaddr =db port = 5432");
     m_connection.reset(&c);
 
 }
diff --git a/server/internal/dbManager/src/dbManager.cpp b/server/internal/dbManager/src/dbManager.cpp
index f1ff766..d508587 100644
--- a/server/internal/dbManager/src/dbManager.cpp
+++ b/server/internal/dbManager/src/dbManager.cpp
@@ -11,7 +11,7 @@ void dbManager::createPool() {
 
     for (auto i = 0; i < POOL_SIZE; i++) {
         connection_pool.emplace(std::make_shared<pqxx::connection>(
-                "dbname =mydb user = postgres password =root hostaddr =172.28.224.1 port = 5432"));
+                "dbname =mydb user = temp password =temp hostaddr =db port = 5432"));
     }
 }
 
diff --git a/server/internal/httpServer/main.cpp b/server/internal/httpServer/main.cpp
index a4b3e8e..edab174 100644
--- a/server/internal/httpServer/main.cpp
+++ b/server/internal/httpServer/main.cpp
@@ -19,13 +19,15 @@ int main(int argc, char* argv[])
 //        return EXIT_FAILURE;
 //    }
 
-    std::cout << "SERVER RUN" << std::endl;
+    std::cout << "SERVER RUN12" << std::endl;
 
     auto const address = net::ip::make_address("0.0.0.0");
     auto const port = static_cast<unsigned short>(std::atoi("8080"));
     auto const doc_root = std::make_shared<std::string>(".");
     auto const threads = std::max<int>(1, std::atoi("1"));
 
+    std::cout << "SERVER INIT" << std::endl;
+
     // The io_context is required for all I/O
     net::io_context ioc{threads};
 
diff --git a/server/internal/httpServer/src/Router.cpp b/server/internal/httpServer/src/Router.cpp
index 617dd96..8daae03 100644
--- a/server/internal/httpServer/src/Router.cpp
+++ b/server/internal/httpServer/src/Router.cpp
@@ -13,7 +13,7 @@ Router::Router(std::string_view doc_root_) :
 
 
 http::message_generator Router::handleRequest(http::request<http::string_body> &&req) {
-
+    std::cout << req << std::endl;
     if(req.method() != http::verb::get && req.method() != http::verb::post)
         return getBadRequest(req, "Unknown HTTP-method");
 
-- 
GitLab