From a1d326c018abfea68b9110f65b376dd9e663f0e6 Mon Sep 17 00:00:00 2001
From: Lucas Mathews <l.mathews@student.fontys.nl>
Date: Sat, 15 Jun 2024 13:12:25 +0200
Subject: [PATCH] Correct Docker Compose

---
 Dockerfile                                  |  8 ++++----
 docker-compose.yml                          |  4 +---
 server/api.py                               |  3 +--
 server/config.py                            |  2 +-
 server/database.py                          | 10 ++++++++--
 requirements.txt => server/requirements.txt |  0
 6 files changed, 15 insertions(+), 12 deletions(-)
 rename requirements.txt => server/requirements.txt (100%)

diff --git a/Dockerfile b/Dockerfile
index 53cb616..ed0694c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -7,10 +7,10 @@ LABEL maintainer="522499@student.fontys.nl"
 
 WORKDIR /server
 
-COPY . /server
+COPY server/ /server/
 
-EXPOSE 81
+EXPOSE 80
 
-RUN pip install --no-cache-dir --upgrade -r /requirements.txt
+RUN pip install --no-cache-dir --upgrade -r /server/requirements.txt
 
-ENTRYPOINT ["python", "./api.py", "--host", "0.0.0.0", "--port", "81"]
+ENTRYPOINT ["python", "/server/api.py"]
diff --git a/docker-compose.yml b/docker-compose.yml
index f981050..5a83188 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -8,7 +8,7 @@ services:
     environment:
       POSTGRES_DB: banking_system
       POSTGRES_USER: dbadmin
-      POSTGRES_PASSWORD: your_db_password
+      POSTGRES_PASSWORD: Happymeal1
     volumes:
       - db_data:/var/lib/postgresql/data
     ports:
@@ -18,8 +18,6 @@ services:
     build: .
     container_name: banking_system_api
     restart: unless-stopped
-    environment:
-      DATABASE_URL: postgres://dbadmin:your_db_password@db/banking_system
     depends_on:
       - db
     ports:
diff --git a/server/api.py b/server/api.py
index 511cd7f..bddade5 100644
--- a/server/api.py
+++ b/server/api.py
@@ -41,8 +41,7 @@ def API():
 ################
 
 if __name__ == "__main__":
-    # Create a thread that will run the run_schedule function in the background
-    log_event("Starting API...")
+    log_event("Starting API...") # Create a thread that will run the run_schedule function in the background
     scheduler = CONFIG["server"]["scheduler"]
     scheduler = False if scheduler.lower() == 'false' else True
     if scheduler:
diff --git a/server/config.py b/server/config.py
index bcdb1a6..8f31855 100644
--- a/server/config.py
+++ b/server/config.py
@@ -4,4 +4,4 @@
 import configparser
 
 CONFIG = configparser.ConfigParser()
-CONFIG.read("bank.ini")
+CONFIG.read("./bank.ini")
diff --git a/server/database.py b/server/database.py
index ebcf8f5..ccd4c56 100644
--- a/server/database.py
+++ b/server/database.py
@@ -5,8 +5,14 @@ from config import CONFIG # Import Config
 from sqlalchemy import create_engine
 from sqlalchemy.orm import sessionmaker
 
-db_url : str = f"{CONFIG['database']['type']}://{CONFIG['database']['user']}:{CONFIG['database']['password']}@{CONFIG['database']['ip']}:{CONFIG['database']['port']}/{CONFIG['database']['name']}"
-print(f"Database URL set to: {db_url}")    
+db_type = CONFIG.get('database', 'type')
+db_user = CONFIG.get('database', 'user')
+db_password = CONFIG.get('database', 'password')
+db_ip = CONFIG.get('database', 'ip')
+db_port = CONFIG.get('database', 'port')
+db_name = CONFIG.get('database', 'name')
+
+db_url : str = f"{db_type}://{db_user}:{db_password}@{db_ip}:{db_port}/{db_name}"
 
 engine = create_engine(db_url, echo=True) # Creates the database engine
 
diff --git a/requirements.txt b/server/requirements.txt
similarity index 100%
rename from requirements.txt
rename to server/requirements.txt