updated deploy preview workflow and docker files accordingly (test Nginx config)

.github/workflows/deploy-previews.yml

@@ -1180,8 +1180,8 @@ jobs:
 
       - name: Build and Push Container
         run: |
-          cd src/website/
-          docker build --tag ${{ env.REGISTRY_URL }}/${{ env.PROJECT_ID }}/pr-previews/website-pr-previews:${{ github.sha }} ./
+          cd website/
+          docker build --tag ${{ env.REGISTRY_URL }}/${{ env.PROJECT_ID }}/pr-previews/website-pr-previews:${{ github.sha }} .
           docker push ${{ env.REGISTRY_URL }}/${{ env.PROJECT_ID }}/pr-previews/website-pr-previews:${{ github.sha }}
 
       - name: Deploy to Cloud Run
@@ -1192,11 +1192,8 @@ jobs:
             --timeout=60 \
             --concurrency=10 \
             --image=${{ env.REGISTRY_URL }}/${{ env.PROJECT_ID }}/pr-previews/website-pr-previews:${{ github.sha }} \
-            --port=8000 \
             --cpu=1000m \
             --memory=1024Mi \
-            --update-secrets=/etc/env/.env=sta-env-website-backend:latest,/etc/config/google_application_credentials.json=sta-key-analytics-service-account:latest \
-            --command="/bin/sh","-c","cat /etc/env/.env >> /app/.env; /app/entrypoint.sh" \
             --allow-unauthenticated
 
       - name: Get preview service url
@@ -1221,5 +1218,5 @@ jobs:
               issue_number: context.issue.number,
               owner: context.repo.owner,
               repo: context.repo.repo,
-              body: 'website changes in this PR available for preview [here](${{ needs.website.outputs.url }})'
-            })           
+              body: 'Website changes in this PR are available for preview [here](${{ needs.website.outputs.url }})'
+            })

src/website/Dockerfile

@@ -2,30 +2,48 @@
 FROM python:3.11-slim
 
 # Set environment variables
-ENV PYTHONDONTWRITEBYTECODE 1
-ENV PYTHONUNBUFFERED 1
+ENV PYTHONDONTWRITEBYTECODE=1
+ENV PYTHONUNBUFFERED=1
 
-# Set the working directory inside the container
+# Set work directory
 WORKDIR /app
 
 # Install system dependencies
 RUN apt-get update && apt-get install -y \
     gcc \
     libpq-dev \
-    && apt-get clean
+    nginx \
+    supervisor \
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/*
 
-# Copy requirements file and install dependencies
-COPY requirements.txt ./
+# Copy requirements and install Python dependencies
+COPY requirements.txt .
 RUN pip install --no-cache-dir -r requirements.txt
 
-# Copy the rest of the backend code into the container
+# Copy project code
 COPY . .
 
-# Expose the port the Django app will run on
-EXPOSE 8000
+# Remove default Nginx configuration if it exists
+RUN rm -f /etc/nginx/conf.d/default.conf
 
-# Add execution permissions to entrypoint.sh
+# Copy custom Nginx configuration
+COPY nginx.conf /etc/nginx/nginx.conf
+
+# Ensure staticfiles directory exists for Nginx
+RUN mkdir -p /usr/share/nginx/html/static/
+
+# Copy Supervisor configuration
+COPY supervisord.conf /etc/supervisor/conf.d/supervisord.conf
+
+# Make entrypoint.sh executable
 RUN chmod +x /app/entrypoint.sh
 
-# Set the entrypoint for the container
+# Set the PORT environment variable (Cloud Run uses 8080 by default)
+ENV PORT=8080
+
+# Expose the port
+EXPOSE 8080
+
+# Start the entrypoint script
 ENTRYPOINT ["/app/entrypoint.sh"]

src/website/entrypoint.sh

@@ -1,16 +1,13 @@
 #!/bin/sh
 
-# Exit immediately if a command exits with a non-zero status
+# Exit on error
 set -e
 
-# Run Django migrations
 echo "Running migrations..."
 python manage.py migrate --noinput
 
-# Collect static files (ensure the static files directory exists)
 echo "Collecting static files..."
 python manage.py collectstatic --noinput
 
-# Start Gunicorn server to serve the Django application
-echo "Starting Gunicorn server..."
-exec gunicorn core.wsgi:application --bind 0.0.0.0:8000 --timeout 600 --workers 3 --log-level info
+echo "Starting Supervisor (which runs Nginx and Gunicorn)..."
+exec /usr/bin/supervisord -c /etc/supervisor/conf.d/supervisord.conf

src/website/nginx.conf

@@ -0,0 +1,51 @@
+user nginx;
+worker_processes auto;
+pid /var/run/nginx.pid;
+
+events {
+    worker_connections 1024;
+}
+
+http {
+    sendfile on;
+    tcp_nopush on;
+    tcp_nodelay on;
+    keepalive_timeout 65;
+    types_hash_max_size 2048;
+
+    include /etc/nginx/mime.types;
+    default_type application/octet-stream;
+
+    access_log /var/log/nginx/access.log;
+    error_log /var/log/nginx/error.log;
+
+    # Set client body size limit to 10MB
+    client_max_body_size 10M;
+
+    upstream django_app {
+        # Gunicorn is running on 127.0.0.1:8000 inside the container
+        server 127.0.0.1:8000;
+    }
+
+    server {
+        listen ${PORT};
+        server_name _;
+
+        # Serve static files
+        location /static/ {
+            alias /usr/share/nginx/html/static/;
+            expires 1y;
+            access_log off;
+            add_header Cache-Control "public";
+        }
+
+        # Proxy all other requests to Gunicorn
+        location / {
+            proxy_pass http://django_app;
+            proxy_set_header Host $host;
+            proxy_set_header X-Real-IP $remote_addr;
+            proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+            proxy_set_header X-Forwarded-Proto $scheme;
+        }
+    }
+}

src/website/supervisord.conf

@@ -0,0 +1,17 @@
+[supervisord]
+nodaemon=true
+
+[program:gunicorn]
+command=gunicorn core.wsgi:application --bind 127.0.0.1:8000 --timeout 600 --workers 3 --log-level info
+directory=/app
+autostart=true
+autorestart=true
+stdout_logfile=/var/log/supervisor/gunicorn.log
+stderr_logfile=/var/log/supervisor/gunicorn_err.log
+
+[program:nginx]
+command=/usr/sbin/nginx -g "daemon off;"
+autostart=true
+autorestart=true
+stdout_logfile=/var/log/supervisor/nginx.log
+stderr_logfile=/var/log/supervisor/nginx_err.log