From 71d3a5ba3e7675c026bbe3570c9f71242c004dca Mon Sep 17 00:00:00 2001 From: erfanmOs <155740354+erfanmOs@users.noreply.github.com> Date: Sat, 25 Oct 2025 14:09:56 +0330 Subject: [PATCH 1/3] Dockerfile for Django project updated --- app/Dockerfile | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 app/Dockerfile diff --git a/app/Dockerfile b/app/Dockerfile new file mode 100644 index 0000000..1676bf0 --- /dev/null +++ b/app/Dockerfile @@ -0,0 +1,13 @@ +FROM python:3.10-slim-buster + +WORKDIR /app + +COPY requirements.txt . + +RUN pip install --no-cache-dir -r requirements.txt + +COPY . . + +RUN python manage.py collectstatic --noinput + +EXPOSE 8000 From 56a2e6d906222c6a6ee177e13c6100f78e85f085 Mon Sep 17 00:00:00 2001 From: erfanmOs <155740354+erfanmOs@users.noreply.github.com> Date: Sat, 25 Oct 2025 14:10:40 +0330 Subject: [PATCH 2/3] Docker-compose file for Django project updated --- Dockerfile | 1 - docker-compose.yml | 38 +++++++++++++++++++++++++++++++++++++- 2 files changed, 37 insertions(+), 2 deletions(-) delete mode 100644 Dockerfile diff --git a/Dockerfile b/Dockerfile deleted file mode 100644 index 26a8f8a..0000000 --- a/Dockerfile +++ /dev/null @@ -1 +0,0 @@ -# ADD DOCKERFILE CONTENT HERE \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index a3437d1..6aed7cd 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1 +1,37 @@ -# ADD Docker Compose CONTENT HERE \ No newline at end of file +version: '3.8' + +services: + postgres: + image: postgres:13 + volumes: + - postgres_data:/var/lib/postgresql/data/ + env_file: + - ./.env + + redis: + image: redis:6-alpine + + backend: + build: ./app + command: gunicorn config.wsgi:application --bind 0.0.0.0:8000 + volumes: + - static_volume:/app/staticfiles + env_file: + - ./.env + depends_on: + - postgres + - redis + + nginx: + image: nginx:alpine + ports: + - "8080:80" + volumes: + - ./nginx/nginx.conf:/etc/nginx/conf.d/default.conf + - static_volume:/app/staticfiles + depends_on: + - backend + +volumes: + postgres_data: + static_volume: From a35718f4a21156891e7d6f1e838a3b1d1f299271 Mon Sep 17 00:00:00 2001 From: erfanmOs <155740354+erfanmOs@users.noreply.github.com> Date: Sat, 25 Oct 2025 14:11:16 +0330 Subject: [PATCH 3/3] nginx.conf file for Django project updated --- nginx/nginx.conf | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/nginx/nginx.conf b/nginx/nginx.conf index ed468cf..7fd55b6 100644 --- a/nginx/nginx.conf +++ b/nginx/nginx.conf @@ -1 +1,14 @@ -# ADD NGINX CONTENT HERE \ No newline at end of file +# ADD NGINX CONTENT HERE +upstream backend { + server backend:8000; +} +server { + listen 80; + location / { + proxy_pass http://backend; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header Host $host; + proxy_redirect off; + } +} +