diff --git a/Docker/Dev/Dockerfile b/Docker/Dev/Dockerfile index ae51407..90466d4 100644 --- a/Docker/Dev/Dockerfile +++ b/Docker/Dev/Dockerfile @@ -1,6 +1,10 @@ -FROM python:3.10-alpine +FROM python:3.10-bullseye + ENV PYTHONUNBUFFERED=1 WORKDIR /code + COPY requirements.txt /code/ + RUN pip install -r requirements.txt + COPY src /code/src/ \ No newline at end of file diff --git a/Docker/Dev/docker-compose.yml b/Docker/Dev/docker-compose.yml index 16ced90..3097c31 100644 --- a/Docker/Dev/docker-compose.yml +++ b/Docker/Dev/docker-compose.yml @@ -1,6 +1,13 @@ version: "3.9" services: + db: + image: postgres + volumes: + - dbdata:/var/lib/postgresql/data + env_file: + - ../../config/db/databasepostgresql_env + django: restart: unless-stopped environment: @@ -17,4 +24,9 @@ services: ports: - "8000:8000" volumes: - - ../../src:/code/src \ No newline at end of file + - ../../src:/code/src + depends_on: + - db + +volumes: + dbdata: \ No newline at end of file diff --git a/Docker/Prod/Dockerfile b/Docker/Prod/Dockerfile index 39154b6..3d81a87 100644 --- a/Docker/Prod/Dockerfile +++ b/Docker/Prod/Dockerfile @@ -1,7 +1,11 @@ -FROM python:3.10-alpine +FROM python:3.10-bullseye + ENV PYTHONUNBUFFERED=1 WORKDIR /code + COPY requirements.txt /code/ + RUN pip install -r requirements.txt + COPY src /code/src/ COPY config /code/config/ \ No newline at end of file diff --git a/src/config/settings/development.py b/src/config/settings/development.py index eb48753..6897714 100644 --- a/src/config/settings/development.py +++ b/src/config/settings/development.py @@ -9,8 +9,12 @@ CSRF_TRUSTED_ORIGINS=['http://127.0.0.1:8000'] DATABASES = { 'default': { - 'ENGINE': 'django.db.backends.sqlite3', - 'NAME': BASE_DIR / 'db.sqlite3', + 'ENGINE': 'django.db.backends.postgresql_psycopg2', + 'NAME': env('DB_NAME'), + 'USER': env('DB_USER'), + 'PASSWORD': env('DB_PASSWORD'), + 'HOST': 'db', + 'PORT': '5432', } }