Merge pull request #6 from Kalgoc/main

Actualización develop

Author: anibalcontreras

.github/workflows/deploy.yml

@@ -31,5 +31,7 @@ jobs:
           pip install pipenv
           pipenv install --system --dev
       - uses: pavelzw/pytest-action@v2
+        env:
+          SECRET_KEY: ${{ secrets.DJANGO_SECRET_KEY }}
         with:
           emoji: false

.github/workflows/pytest.yml

@@ -2,18 +2,14 @@ FROM python:3.11-alpine
 
 WORKDIR /app
 
-# Instalar paquetes necesarios para construir psycopg2 y otras dependencias, y netcat para comprobar la conexión de la base de datos
 RUN apk add --no-cache gcc musl-dev python3-dev libffi-dev postgresql-dev
 RUN apk add --no-cache netcat-openbsd
 
-# Install pipenv
 RUN pip install --upgrade pip
 RUN pip install pipenv
 
-# Install application dependencies
 COPY Pipfile Pipfile.lock /app/
-# We use the --system flag so packages are installed into the system python
-# and not into a virtualenv. Docker containers don't need virtual environments.
+
 RUN pipenv install --system --dev
 
 COPY . /app/

Dev.Dockerfile

@@ -0,0 +1,20 @@
+FROM python:3.11-alpine
+
+WORKDIR /app
+
+RUN apk add --no-cache gcc musl-dev libffi-dev postgresql-dev bash
+
+RUN pip install --upgrade pip
+RUN pip install pipenv
+
+COPY Pipfile Pipfile.lock /app/
+
+RUN pipenv install --system --deploy
+
+COPY . /app/
+COPY docker-entrypoint.sh /app/
+RUN chmod +x /app/docker-entrypoint.sh
+
+EXPOSE 8000
+
+ENTRYPOINT [ "./docker-entrypoint.sh" ]

Dockerfile

@@ -4,9 +4,6 @@ services:
   db:
     container_name: db
     image: postgres:latest
-    environment:
-      - POSTGRES_USER=postgres
-      - POSTGRES_PASSWORD=postgres
     volumes:
       - postgres_data:/var/lib/postgresql/data
     ports:
@@ -17,7 +14,7 @@ services:
   web:
     build:
       context: .
-      dockerfile: Dev.Dockerfile
+      dockerfile: Dockerfile
     container_name: web
     volumes:
       - .:/app
@@ -28,6 +25,13 @@ services:
       - db
     networks:
       - app_network
+    environment:
+      POSTGRES_DB: ${DB_NAME}
+      POSTGRES_USER: ${DB_USER}
+      POSTGRES_PASSWORD: ${DB_PASSWORD}
+      POSTGRES_PORT: ${DB_PORT}
+      POSTGRES_HOST: ${DB_HOST}
+      DJANGO_SETTINGS_MODULE: piggywallet.settings.prod
 
 networks:
   app_network:

docker-compose.yml

@@ -6,8 +6,7 @@
 
 def main():
     """Run administrative tasks."""
-    os.environ.setdefault("DJANGO_SETTINGS_MODULE", "piggywallet.settings.dev")
-    # os.environ.setdefault("DJANGO_CONFIGURATION", "piggywallet.settings.prod")
+    os.environ.setdefault("DJANGO_CONFIGURATION", "piggywallet.settings")
     try:
         from django.core.management import execute_from_command_line
     except ImportError as exc:

manage.py

@@ -11,7 +11,10 @@
 """
 
 from pathlib import Path
+import os
+from dotenv import load_dotenv
 
+load_dotenv()
 # Build paths inside the project like this: BASE_DIR / 'subdir'.
 BASE_DIR = Path(__file__).resolve().parent.parent
 
@@ -20,13 +23,7 @@
 # See https://docs.djangoproject.com/en/5.0/howto/deployment/checklist/
 
 # SECURITY WARNING: keep the secret key used in production secret!
-SECRET_KEY = "django-insecure-epw6&76ijtauz9tb6p+a%-&gdfwtuao3p6@p9v=230r_0zd2l+"
-
-# SECURITY WARNING: don't run with debug turned on in production!
-DEBUG = True
-
-ALLOWED_HOSTS = []
-
+SECRET_KEY = os.getenv("SECRET_KEY")
 
 # Application definition
 

piggywallet/settings/base.py

@@ -2,8 +2,8 @@
 import os
 from dotenv import load_dotenv
 
-# DEBUG = False
-# ALLOWED_HOSTS = ['mydomain.com']
+DEBUG = False
+ALLOWED_HOSTS = os.getenv("ALLOWED_HOSTS", "").split(",")
 
 load_dotenv()
 DATABASES = {