From cf0127ba38690a207b6376fcfd7c77b1cbf573ab Mon Sep 17 00:00:00 2001
From: salazard <hamzatouizrat@yahoo.com>
Date: Fri, 11 Nov 2022 23:00:56 +0100
Subject: [PATCH] add docker compose front
---
.gitignore | 2 ++
Dockerfile | 8 +++----
docker-compose.yml | 21 ++++++++++++++++---
oser_backend/settings/dev.py | 2 +-
oser_backend/settings/production.py | 2 --
.../migrations/0017_auto_20221111_2210.py | 18 ++++++++++++++++
visits/migrations/0003_fix_db_trouble.py | 7 ++++---
visits/migrations/0005_auto_20221111_2210.py | 18 ++++++++++++++++
8 files changed, 65 insertions(+), 13 deletions(-)
create mode 100644 profiles/migrations/0017_auto_20221111_2210.py
create mode 100644 visits/migrations/0005_auto_20221111_2210.py
diff --git a/.gitignore b/.gitignore
index c4f4ed6..5dbbd65 100644
--- a/.gitignore
+++ b/.gitignore
@@ -32,3 +32,5 @@ static/
# Supervisor
supervisord.pid
sendgrid.env
+api_mail
+.gitignore
diff --git a/Dockerfile b/Dockerfile
index 5126aee..06f76d9 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,9 +1,9 @@
FROM python:3.8
WORKDIR /var/www/oser-backend
-COPY . .
-VOLUME [ "/var/www/oser-backend" ]
-ENV DEBIAN_FRONTEND=noninteractive
+ENV DEBIAN_FRONTEND=noninteractive
RUN apt update && apt install -y build-essential postgresql libpq-dev python3-dev git
-RUN python3 -m pip install -r requirements.txt
+COPY ./requirements.txt .
+VOLUME [ "/var/www/oser-backend" ]
EXPOSE 8000
+RUN python3 -m pip install -r requirements.txt
CMD python3 manage.py makemigrations && python3 manage.py migrate && python3 manage.py runserver 0.0.0.0:8000
diff --git a/docker-compose.yml b/docker-compose.yml
index 2b05319..2485e2d 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,9 +1,9 @@
-# Use postgres/example user/password credentials
version: '3.1'
services:
db:
+ container_name: postgres
image: postgres
restart: always
volumes:
@@ -12,12 +12,27 @@ services:
POSTGRES_PASSWORD: q
POSTGRES_DB: oser_backend_db
- oser:
- image: oser-backend:latest
+ oser-backend:
+ container_name: oser-backend
+ build:
+ context: .
+ dockerfile: Dockerfile
restart: always
volumes:
- .:/var/www/oser-backend
ports:
- "8000:8000"
+ depends_on:
+ - db
+ oser-frontend:
+ container_name: oser-frontend
+ build:
+ context: ../oser-frontend
+ dockerfile: Dockerfile
+ restart: always
+ volumes:
+ - .:/var/www/oser-backend
+ ports:
+ - "4200:4200"
volumes:
db_data: {}
\ No newline at end of file
diff --git a/oser_backend/settings/dev.py b/oser_backend/settings/dev.py
index 7fdc70c..719f54e 100644
--- a/oser_backend/settings/dev.py
+++ b/oser_backend/settings/dev.py
@@ -5,7 +5,7 @@ from .common import *
from .common import BASE_DIR
DEBUG = True
-ALLOWED_HOSTS = ['localhost','127.0.0.1']
+ALLOWED_HOSTS = ['localhost','127.0.0.1','oser-backend']
# Static files (CSS, JavaScript, Images) and media files (user-uploaded)
diff --git a/oser_backend/settings/production.py b/oser_backend/settings/production.py
index 1211646..bd85664 100644
--- a/oser_backend/settings/production.py
+++ b/oser_backend/settings/production.py
@@ -15,8 +15,6 @@ DEBUG = os.environ.get('DEBUG', False) or False
ALLOWED_HOSTS = [
'localhost',
- 'oser-backend.herokuapp.com',
- 'oser-backend-dev.herokuapp.com',
'oser-cs.fr',
]
diff --git a/profiles/migrations/0017_auto_20221111_2210.py b/profiles/migrations/0017_auto_20221111_2210.py
new file mode 100644
index 0000000..2dd7f17
--- /dev/null
+++ b/profiles/migrations/0017_auto_20221111_2210.py
@@ -0,0 +1,18 @@
+# Generated by Django 2.2 on 2022-11-11 21:10
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('profiles', '0016_auto_20211225_1242'),
+ ]
+
+ operations = [
+ migrations.AlterField(
+ model_name='tutor',
+ name='promotion',
+ field=models.IntegerField(choices=[(2025, '2025'), (2024, '2024'), (2023, '2023'), (2022, '2022'), (2021, '2021')], default=2025),
+ ),
+ ]
diff --git a/visits/migrations/0003_fix_db_trouble.py b/visits/migrations/0003_fix_db_trouble.py
index ae13abd..9bf86ae 100644
--- a/visits/migrations/0003_fix_db_trouble.py
+++ b/visits/migrations/0003_fix_db_trouble.py
@@ -3,9 +3,10 @@ from ..models import Participation
def postgres_migration_prep(apps, schema_editor):
- participations = Participation.objects.filter(accepted=True)
- for participation in participations:
- participation.accepted = 1
+ # participations = Participation.objects.filter(accepted=True)
+ # for participation in participations:
+ # participation.accepted = 1
+ pass
class Migration(migrations.Migration):
diff --git a/visits/migrations/0005_auto_20221111_2210.py b/visits/migrations/0005_auto_20221111_2210.py
new file mode 100644
index 0000000..539e495
--- /dev/null
+++ b/visits/migrations/0005_auto_20221111_2210.py
@@ -0,0 +1,18 @@
+# Generated by Django 2.2 on 2022-11-11 21:10
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('visits', '0004_auto_20211225_1242'),
+ ]
+
+ operations = [
+ migrations.AlterField(
+ model_name='participation',
+ name='accepted',
+ field=models.IntegerField(choices=[(0, 'refusé'), (1, 'accepté'), (2, 'en attente'), (3, 'inconnue')], default=3, help_text='Cocher pour confirmer au tutoré sa participation à la sortie.'),
+ ),
+ ]
--
GitLab