Merge pull request #55 from druling/dev

Release 4 Feb 2025

Author: ayushsinghal90

.env.example

@@ -1,5 +1,6 @@
 PORT=3000
-DEV=True
+ENV=dev
+DEBUG=True
 ALLOWED_HOSTS=localhost,127.0.0.1,
 
 # Google OAuth Credentials
@@ -16,13 +17,12 @@ DATABASE_PORT=5432
 # Redis Credentials
 REDIS_HOST=localhost
 REDIS_PORT=6379
+REDIS_PASSWORD=your-redis-password
 
 # JWT Token Lifetime
 ACCESS_TOKEN_LIFETIME=3600
 
 # AWS Credentials
-AWS_ACCESS_KEY_ID=your-access-key-id
-AWS_SECRET_ACCESS_KEY=your-secret-access-key
 AWS_DEFAULT_REGION=ap-south-1
 
 # AWS Credentials for Localstack

.github/workflows/build.yml

@@ -1,9 +1,9 @@
-name: Build and Push
+name: Build, Push, and Deploy
 
 on:
   push:
     branches:
-      - gracefull_shutdown
+      - handle_bounce_email
 
 jobs:
   build-and-push:
@@ -46,4 +46,39 @@ jobs:
           docker push $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG
           docker push $ECR_REGISTRY/$ECR_REPOSITORY:latest
           
-          echo "::set-output name=image::$ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG"
+          echo "image=$ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG" >> $GITHUB_OUTPUT
+
+  update-ecs-service:
+    name: Update ECS Service
+    runs-on: ubuntu-latest
+    needs: build-and-push
+    environment: dev
+
+    permissions:
+      id-token: write
+      contents: read
+
+    env:
+      AWS_REGION: ${{ secrets.AWS_DEFAULT_REGION }}
+      ECS_CLUSTER: ${{ secrets.ECS_NAME }}
+      ECS_SERVICE: ${{ secrets.ECS_NAME }}
+      IMAGE: ${{ needs.build-and-push.outputs.image }}
+
+    steps:
+      - name: Configure AWS credentials
+        uses: aws-actions/configure-aws-credentials@v4
+        with:
+          role-to-assume: ${{ secrets.AWS_ROLE_ARN }}
+          aws-region: ${{ secrets.AWS_DEFAULT_REGION }}
+
+      - name: Update ECS service
+        run: |
+          aws ecs update-service \
+            --cluster $ECS_CLUSTER \
+            --service $ECS_SERVICE \
+            --force-new-deployment \
+            --region $AWS_REGION \
+            --no-cli-pager \
+            > /dev/null 2>&1
+          
+          echo "Started Deployment"

build/docker/Dockerfile

@@ -6,12 +6,17 @@ ENV PYTHONDONTWRITEBYTECODE 1  # Prevent Python from writing .pyc files
 ENV PYTHONUNBUFFERED 1        # Force the stdout and stderr streams to be unbuffered
 
 # Install system dependencies
-RUN apt-get update && apt-get install -y --no-install-recommends postgresql-client && \
+RUN apt-get update && apt-get install -y --no-install-recommends \
+    curl \
+    postgresql-client && \
     apt-get clean && rm -rf /var/lib/apt/lists/*
 
 # Set the working directory in the container
 WORKDIR /app
 
+# Ensure required directories exist
+RUN mkdir -p /app/static /app/media
+
 # Copy the requirements file to the container
 COPY ../../requirements.txt /app/
 
@@ -21,17 +26,14 @@ RUN pip install --no-cache-dir -r requirements.txt
 # Copy the rest of the application code to the container
 COPY ../../ /app/
 
-# Copy the supervisord configuration file
-COPY /build/docker/supervisord.conf /etc/supervisor/conf.d/supervisord.conf
-
 # Copy the entrypoint configuration file
 COPY /build/docker/entrypoint.sh /app/entrypoint.sh
 
-# Make the entrypoint script executable
-RUN chmod +x /app/entrypoint.sh
-
 # Expose port 8000 for the Django server
 EXPOSE 8000
 
-# Use the entrypoint script
+# Make the entrypoint script executable
+RUN chmod +x /app/entrypoint.sh
+
+# Set the entrypoint script
 ENTRYPOINT ["/app/entrypoint.sh"]

build/docker/entrypoint.sh

@@ -1,11 +1,51 @@
 #!/bin/bash
-
 set -e
 
+# Function to gracefully shut down Gunicorn
+shutdown() {
+    echo "Shutdown signal received. Stopping Gunicorn gracefully..."
+
+    # Gracefully stop Gunicorn workers (stops accepting new requests)
+    kill -SIGTERM $GUNICORN_PID
+
+    # Allow some time for in-progress requests to complete
+    echo "Waiting for ongoing requests to finish..."
+    sleep 10  # Adjust time as needed
+
+    # Force kill Gunicorn if it's still running after the grace period
+    kill -9 $GUNICORN_PID 2>/dev/null || true
+
+    echo "Shutdown complete."
+    exit 0
+}
+
+# Trap SIGTERM and SIGINT signals (container stop or AWS shutdown notice)
+trap shutdown SIGTERM SIGINT
+
 # Apply database migrations
 echo "Applying database migrations..."
 python manage.py migrate
 
-# Start supervisord
-echo "Starting supervisord..."
-exec supervisord -c /etc/supervisor/conf.d/supervisord.conf
+# Set up email templates with the --force option
+echo "Setting up email templates..."
+python manage.py setup_email_templates --force
+
+# Start Gunicorn in the background with graceful timeout
+echo "Starting Gunicorn..."
+gunicorn --bind 0.0.0.0:8000 setup.wsgi:application --workers 4 --timeout 90 &
+
+# Store the PID of the Gunicorn process
+GUNICORN_PID=$!
+
+# Poll AWS metadata service for spot termination notice
+while true; do
+    TERMINATION_INFO=$(curl -s http://169.254.169.254/latest/meta-data/spot/instance-action || true)
+    if [ -n "$TERMINATION_INFO" ]; then
+        echo "AWS Spot termination notice detected! Gracefully shutting down..."
+        shutdown
+    fi
+    sleep 5
+done
+
+# Wait for Gunicorn to exit
+wait $GUNICORN_PID

build/docker/supervisord.conf

@@ -0,0 +1,30 @@
+# Use an official Python runtime as a base image
+FROM python:3.10-slim
+
+# Set environment variables
+ENV PYTHONDONTWRITEBYTECODE 1  # Prevent Python from writing .pyc files
+ENV PYTHONUNBUFFERED 1        # Force the stdout and stderr streams to be unbuffered
+
+# Install system dependencies
+RUN apt-get update && apt-get install -y --no-install-recommends \
+    postgresql-client \
+    supervisor && \
+    apt-get clean && rm -rf /var/lib/apt/lists/*
+
+# Set the working directory in the container
+WORKDIR /app
+
+# Copy the requirements file to the container
+COPY ../../requirements.txt /app/
+
+# Install dependencies
+RUN pip install --no-cache-dir -r requirements.txt
+
+# Copy the rest of the application code to the container
+COPY ../../ /app/
+
+# Expose port 8000 for the Django server
+EXPOSE 3000
+
+# Use the entrypoint script
+CMD ["python", "manage.py", "runserver", "0.0.0.0:3000"]

build/stack/web/Dockerfile

@@ -3,7 +3,7 @@
 from django.conf import settings
 
 
-def boto_client(service=None):
+def boto_client(service=None, config=None):
     if service is None:
         raise ValueError("Service name is required")
 
@@ -15,4 +15,6 @@ def boto_client(service=None):
         )
     else:
         # Production AWS configuration
-        return boto3.client(service, region_name=settings.AWS_DEFAULT_REGION)
+        return boto3.client(
+            service, region_name=settings.AWS_DEFAULT_REGION, config=config
+        )

commons/clients/boto_client.py

@@ -4,13 +4,15 @@
 
 redis_host = os.getenv("REDIS_HOST", "localhost")
 redis_port = os.getenv("REDIS_PORT", 6379)
+redis_pass = os.getenv("REDIS_PASSWORD", None)
 
 
 class RedisClient:
     def __init__(self):
         self.client = redis.StrictRedis(
             host=redis_host,
             port=redis_port,
+            password=redis_pass,
             decode_responses=True,  # Automatically decode byte strings to regular strings
         )
 

commons/clients/redis_client.py

@@ -0,0 +1,19 @@
+from enum import Enum
+from django.conf import settings
+
+
+env = settings.ENV
+
+
+class BaseResourceEnum(Enum):
+    def __str__(self):
+        return f"{env}-{self.value}"
+
+    @property
+    def value(self) -> str:
+        return f"{env}-{super().value}"
+
+    @classmethod
+    def choices(cls):
+        """Generate choices for use in Django models."""
+        return [(item.value, item.name) for item in cls]