From 50e47d59613fd8eda11d69989bb86f867b163d4b Mon Sep 17 00:00:00 2001
From: PCoder <purple.coder@yahoo.co.uk>
Date: Mon, 31 Jul 2023 08:30:24 +0000
Subject: [PATCH] Changes to get the server up and running

---
 docker-compose.yml          | 44 ++++++++++++++++++++-----------------
 dynamicweb/settings/base.py |  8 +++++--
 2 files changed, 30 insertions(+), 22 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 29365eb7..a8000ac5 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,38 +1,42 @@
-version: '3.8'
+version: '3'
 
 services:
+  # Django app service
   web:
     build:
-      context: ./
+      context: .
       dockerfile: Dockerfile
-    command: gunicorn dynamicweb.wsgi:application --bind [::]:8000
+    container_name: dynamicweb 
+    command: python manage.py runserver 0.0.0.0:8000
     volumes:
-      - static_volume:/data/app/app/static
-      - media_volume:/data/app/app/media
-    expose:
-      - 8000
-    env_file:
-      - ./.env
+      - .:/app
+    ports:
+      - "8000:8000"
     depends_on:
       - db
+
+  # PostgreSQL database service
   db:
-    image: postgres:13.0-alpine
+    image: postgres:13
+    container_name: my_postgres_db
+    environment:
+      POSTGRES_USER: your_postgres_username
+      POSTGRES_PASSWORD: your_postgres_password
+      POSTGRES_DB: your_database_name
     volumes:
-      - ./init.sql:/docker-entrypoint-initdb.d/init.sql
-      - postgres_data:/data/var/lib/postgresql/data/
-    env_file:
-      - ./.env
+      - postgres_data:/var/lib/postgresql/data
+
+  # Nginx service
   nginx:
-    build: ./nginx
+    image: nginx:latest
+    container_name: my_nginx_server
     volumes:
-      - static_volume:/data/app/app/static
-      - media_volume:/data/app/app/media
+      - ./nginx/default.conf:/etc/nginx/conf.d/default.conf
     ports:
-      - 1337:80
+      - "80:80"
     depends_on:
       - web
 
 volumes:
   postgres_data:
-  static_volume:
-  media_volume:
+
diff --git a/dynamicweb/settings/base.py b/dynamicweb/settings/base.py
index 821e1e0c..5d5af9a3 100644
--- a/dynamicweb/settings/base.py
+++ b/dynamicweb/settings/base.py
@@ -239,8 +239,12 @@ CMS_TEMPLATES = (
 
 DATABASES = {
     'default': {
-        'ENGINE': 'django.db.backends.postgresql_psycopg2',
-        'NAME': 'app',
+        'ENGINE': 'django.db.backends.postgresql',
+        'NAME': 'your_database_name',
+        'USER': 'your_postgres_username',
+        'PASSWORD': 'your_postgres_password',
+        'HOST': 'db',
+        'PORT': '5432'
     }
 }