From 3550a21d3e8000b6cd983a2b565cd1e15f38567c Mon Sep 17 00:00:00 2001 From: CarmelitaBraga Date: Wed, 25 Sep 2024 20:25:17 -0300 Subject: [PATCH 1/9] chore: muda o caminho do requirements --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 8f85d26..5100c9b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM python:3.11 WORKDIR /projetin -COPY requirements.txt . +COPY requirements/requirements.txt . RUN pip install --upgrade pip && \ pip install --no-cache-dir -r requirements.txt @@ -16,4 +16,4 @@ COPY manage.py . EXPOSE 8080 -CMD ["python3", "manage.py", "runserver", "0.0.0.0:8000"] \ No newline at end of file +CMD ["python3", "manage.py", "runserver", "0.0.0.0:8000"] From 25cc9ad03f2263a464f8698be0692725e3935e13 Mon Sep 17 00:00:00 2001 From: CarmelitaBraga Date: Wed, 25 Sep 2024 21:28:56 -0300 Subject: [PATCH 2/9] =?UTF-8?q?chore:=20atualiza=20configura=C3=A7=C3=B5es?= =?UTF-8?q?=20do=20bd=20no=20docker=20compose?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/settings.py | 2 +- docker-compose.yml | 26 ++++++++++++++++++++------ 2 files changed, 21 insertions(+), 7 deletions(-) diff --git a/backend/settings.py b/backend/settings.py index 7870186..35b0fc3 100644 --- a/backend/settings.py +++ b/backend/settings.py @@ -112,7 +112,7 @@ 'NAME': 'postgres', 'USER': 'postgres', 'PASSWORD': 'postgres', - 'HOST': 'postgres_db', + 'HOST': 'db', 'PORT': '5432', } } diff --git a/docker-compose.yml b/docker-compose.yml index 2eff19f..90dd329 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,8 +1,13 @@ services: - web: - build: . - container_name: projetin - command: python3 manage.py runserver 0.0.0.0:8000 + backend: + build: + context: . + container_name: backend + command: > + /bin/sh -c "python3 manage.py makemigrations && + python3 manage.py migrate && + python3 manage.py iniciar && + python3 manage.py runserver 0.0.0.0:8000" volumes: - .:/projetin ports: @@ -13,9 +18,11 @@ services: - DB_USER=postgres - DB_PASSWORD=postgres - DB_HOST=db - - DB_PORT=5432 + - DB_PORT=5433 depends_on: - db + networks: + - app-network db: image: postgres:15 @@ -27,7 +34,14 @@ services: POSTGRES_USER: postgres POSTGRES_PASSWORD: postgres ports: - - "5432:5432" + - "5433:5432" + networks: + - app-network + + +networks: + app-network: + driver: bridge volumes: postgres_data: From 67f625e00a1acdfc9c2e2ae2b4a10ab72a192aef Mon Sep 17 00:00:00 2001 From: CarmelitaBraga Date: Wed, 25 Sep 2024 21:41:11 -0300 Subject: [PATCH 3/9] chore: render configs --- docker-compose.yml | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 90dd329..0f8ce96 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -2,7 +2,7 @@ services: backend: build: context: . - container_name: backend + container_name: projetin-backend command: > /bin/sh -c "python3 manage.py makemigrations && python3 manage.py migrate && @@ -11,18 +11,16 @@ services: volumes: - .:/projetin ports: - - "8000:8000" + - "8000:8000" # Expose port 8000 for the backend environment: - DEBUG=1 - DB_NAME=postgres - DB_USER=postgres - DB_PASSWORD=postgres - - DB_HOST=db - - DB_PORT=5433 + - DB_HOST=db # Keep 'db' for internal service communication + - DB_PORT=5432 depends_on: - db - networks: - - app-network db: image: postgres:15 @@ -34,14 +32,7 @@ services: POSTGRES_USER: postgres POSTGRES_PASSWORD: postgres ports: - - "5433:5432" - networks: - - app-network - - -networks: - app-network: - driver: bridge + - "5432:5432" # Expose PostgreSQL on port 5432 volumes: postgres_data: From ff3cd73ae9069089a3604e014bed11ff2979c79e Mon Sep 17 00:00:00 2001 From: CarmelitaBraga Date: Wed, 25 Sep 2024 22:11:16 -0300 Subject: [PATCH 4/9] chore: deleta compose e cria variaveis de ambiente --- .gitignore | 4 +++- backend/settings.py | 11 ++++++----- docker-compose.yml | 38 -------------------------------------- 3 files changed, 9 insertions(+), 44 deletions(-) delete mode 100644 docker-compose.yml diff --git a/.gitignore b/.gitignore index 6b6867e..873d9a1 100644 --- a/.gitignore +++ b/.gitignore @@ -170,4 +170,6 @@ media/historicos /load_test/files/* # Coverage -.coveragerc \ No newline at end of file +.coveragerc + +.env \ No newline at end of file diff --git a/backend/settings.py b/backend/settings.py index 35b0fc3..7fbc62d 100644 --- a/backend/settings.py +++ b/backend/settings.py @@ -109,15 +109,16 @@ DATABASES = { 'default': { 'ENGINE': 'django.db.backends.postgresql', - 'NAME': 'postgres', - 'USER': 'postgres', - 'PASSWORD': 'postgres', - 'HOST': 'db', - 'PORT': '5432', + 'NAME': os.getenv('DB_NAME', 'postgres'), + 'USER': os.getenv('DB_USER', 'postgres'), + 'PASSWORD': os.getenv('DB_PASSWORD', 'postgres'), + 'HOST': os.getenv('DB_HOST', 'db'), + 'PORT': os.getenv('DB_PORT', '5432'), } } + # Password validation # https://docs.djangoproject.com/en/5.0/ref/settings/#auth-password-validators diff --git a/docker-compose.yml b/docker-compose.yml deleted file mode 100644 index 0f8ce96..0000000 --- a/docker-compose.yml +++ /dev/null @@ -1,38 +0,0 @@ -services: - backend: - build: - context: . - container_name: projetin-backend - command: > - /bin/sh -c "python3 manage.py makemigrations && - python3 manage.py migrate && - python3 manage.py iniciar && - python3 manage.py runserver 0.0.0.0:8000" - volumes: - - .:/projetin - ports: - - "8000:8000" # Expose port 8000 for the backend - environment: - - DEBUG=1 - - DB_NAME=postgres - - DB_USER=postgres - - DB_PASSWORD=postgres - - DB_HOST=db # Keep 'db' for internal service communication - - DB_PORT=5432 - depends_on: - - db - - db: - image: postgres:15 - container_name: postgres_db - volumes: - - postgres_data:/var/lib/postgresql/data - environment: - POSTGRES_DB: postgres - POSTGRES_USER: postgres - POSTGRES_PASSWORD: postgres - ports: - - "5432:5432" # Expose PostgreSQL on port 5432 - -volumes: - postgres_data: From c3cb66080aa331d5319b137f047e48790ad57df6 Mon Sep 17 00:00:00 2001 From: CarmelitaBraga Date: Wed, 25 Sep 2024 22:30:11 -0300 Subject: [PATCH 5/9] chore: adiciona host permitido --- backend/settings.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/settings.py b/backend/settings.py index 7fbc62d..d908604 100644 --- a/backend/settings.py +++ b/backend/settings.py @@ -29,7 +29,7 @@ # SECURITY WARNING: don't run with debug turned on in production! DEBUG = True -ALLOWED_HOSTS = [] +ALLOWED_HOSTS = ['backend-0ytn.onrender.com', 'localhost', '127.0.0.1'] # Application definition From 669fdfd16630f24c5caaab4f98f5c0c98438ebb2 Mon Sep 17 00:00:00 2001 From: CarmelitaBraga Date: Wed, 25 Sep 2024 22:45:11 -0300 Subject: [PATCH 6/9] chore: add gunicorn --- requirements/requirements.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/requirements/requirements.txt b/requirements/requirements.txt index f69ce78..088aae7 100644 --- a/requirements/requirements.txt +++ b/requirements/requirements.txt @@ -22,4 +22,5 @@ tzdata==2024.1 urllib3==2.2.3 autopep8==2.3.1 pylint==3.3.0 -bandit==1.7.9 \ No newline at end of file +bandit==1.7.9 +gunicorn==23.0.0 \ No newline at end of file From 73e21a8fef865e0e4e8db559a0f0b86a39bedc44 Mon Sep 17 00:00:00 2001 From: CarmelitaBraga Date: Sat, 28 Sep 2024 13:12:09 -0300 Subject: [PATCH 7/9] chore: comando de iniciar bd dentro do dockerfile --- Dockerfile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Dockerfile b/Dockerfile index 5100c9b..64d4dea 100644 --- a/Dockerfile +++ b/Dockerfile @@ -16,4 +16,8 @@ COPY manage.py . EXPOSE 8080 +RUN python3 manage.py makemigrations && \ + python3 manage.py migrate && \ + python3 manage.py iniciar + CMD ["python3", "manage.py", "runserver", "0.0.0.0:8000"] From 8045a4445426746ad2065040af8662f2da8fa57d Mon Sep 17 00:00:00 2001 From: CarmelitaBraga Date: Sat, 28 Sep 2024 21:38:48 -0300 Subject: [PATCH 8/9] chore: remove envs do dockerfile --- Dockerfile | 4 ---- 1 file changed, 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 64d4dea..5100c9b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -16,8 +16,4 @@ COPY manage.py . EXPOSE 8080 -RUN python3 manage.py makemigrations && \ - python3 manage.py migrate && \ - python3 manage.py iniciar - CMD ["python3", "manage.py", "runserver", "0.0.0.0:8000"] From db19c8fd1f3af24f93d3ab6e058abe69a587844d Mon Sep 17 00:00:00 2001 From: CarmelitaBraga Date: Sat, 28 Sep 2024 15:45:09 -0300 Subject: [PATCH 9/9] chore: modifica configs de CORS --- backend/settings.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/backend/settings.py b/backend/settings.py index d908604..6bf7d4e 100644 --- a/backend/settings.py +++ b/backend/settings.py @@ -163,9 +163,11 @@ CORS_ORIGIN_ALLOW_ALL = True -# CORS_ALLOWED_ORIGINS = [ -# 'http://localhost:8000', -# ] +CORS_ALLOWED_ORIGINS = [ + 'https://frontend-ashen-seven-61.vercel.app', +] + +CORS_ALLOW_CREDENTIALS = True MEDIA_URL = '/media/' MEDIA_ROOT = BASE_DIR / 'media'