OpenTofu infra for deploying on ec2

.github/workflows/create-and-publish-docker-images.yml

@@ -0,0 +1,80 @@
+# source: https://docs.github.com/en/actions/tutorials/publish-packages/publish-docker-images#publishing-images-to-docker-hub-and-github-packages
+name: Create and publish a Docker image
+
+# manually trigger while testing 
+on:
+  push:
+    branches:
+      - main
+  workflow_dispatch:
+
+# Defines two custom environment variables for the workflow. These are used for the Container registry domain, and a name for the Docker image that this workflow builds.
+env:
+  REGISTRY: ghcr.io
+
+jobs:
+  build-and-push-image:
+    runs-on: ubuntu-latest
+    # Sets the permissions granted to the `PACKAGE_TOKEN` for the actions in this job.
+    permissions:
+      contents: read
+      packages: write
+      attestations: write
+      id-token: write
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v5
+      # Uses the `docker/login-action` action to log in to the Container registry registry using the account and password that will publish the packages. Once published, the packages are scoped to the account defined here.
+      - name: Log in to the Container registry
+        uses: docker/login-action@v3
+        with:
+          registry: ${{ env.REGISTRY }}
+          username: ${{ github.actor }}
+          password: ${{ secrets.PACKAGE_TOKEN }}
+      # This step uses [docker/metadata-action](https://github.com/docker/metadata-action#about) to extract tags and labels that will be applied to the specified image. The `id` "meta" allows the output of this step to be referenced in a subsequent step. The `images` value provides the base name for the tags and labels.
+      - name: Set lowercase image name
+        run: |
+          IMAGE_NAME=$(echo "${GITHUB_REPOSITORY}" | tr '[:upper:]' '[:lower:]')
+          echo "IMAGE_NAME=${IMAGE_NAME}" >> $GITHUB_ENV
+      - name: Extract metadata (tags, labels) for Docker
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
+      # This step uses the `docker/build-push-action` action to build the image, based on your repository's `Dockerfile`. If the build succeeds, it pushes the image to GitHub Packages.
+      # It uses the `context` parameter to define the build's context as the set of files located in the specified path. For more information, see [Usage](https://github.com/docker/build-push-action#usage) in the README of the `docker/build-push-action` repository.
+      # It uses the `tags` and `labels` parameters to tag and label the image with the output from the "meta" step.
+
+      - name: Build and push web Docker image
+        id: push
+        uses: docker/build-push-action@v6
+        with:
+          context: ./TEKDB
+          file: ./TEKDB/Dockerfile
+          push: true
+          tags: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}/web:latest,${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}/web:${{ github.sha }}
+          labels: ${{ steps.meta.outputs.labels }}
+      - name: Build and push proxy Docker image
+        id: push-proxy
+        uses: docker/build-push-action@v6
+        with:
+          context: ./proxy
+          file: ./proxy/Dockerfile
+          push: true
+          tags: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}/proxy:latest,${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}/proxy:${{ github.sha }}
+          labels: ${{ steps.meta.outputs.labels }}
+
+      # This step generates an artifact attestation for the image, which is an unforgeable statement about where and how it was built. It increases supply chain security for people who consume the image. For more information, see [Using artifact attestations to establish provenance for builds](/actions/security-guides/using-artifact-attestations-to-establish-provenance-for-builds).
+      - name: Generate artifact attestation for web image
+        uses: actions/attest-build-provenance@v3
+        with:
+          subject-name: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}/web
+          subject-digest: ${{ steps.push.outputs.digest }}
+          push-to-registry: true
+      - name: Generate artifact attestation for proxy image
+        uses: actions/attest-build-provenance@v3
+        with:
+          subject-name: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}/proxy
+          subject-digest: ${{ steps.push-proxy.outputs.digest }}
+          push-to-registry: true
+

.github/workflows/deploy-ec2-staging.yml

@@ -0,0 +1,107 @@
+name: Build, Push, and Deploy to EC2 Staging
+
+on:
+  push:
+    branches:
+      - develop
+  workflow_dispatch:
+
+jobs:
+  build-push-and-deploy:
+    name: Build, Push to ECR, Deploy to EC2 Staging
+    runs-on: ubuntu-latest
+    permissions: 
+        id-token: write
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v5
+
+      - name: Configure AWS credentials
+        uses: aws-actions/configure-aws-credentials@v5
+        with:
+          role-to-assume: ${{ secrets.AWS_ROLE_ARN }}
+          aws-region: ${{ secrets.AWS_REGION}}
+
+      - name: Login to Amazon ECR
+        id: login-ecr
+        uses: aws-actions/amazon-ecr-login@v2
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Build, tag, and push web Docker image to ECR
+        id: build-web-image
+        env:
+          IMAGE_TAG: ${{ github.sha }}
+          IMAGE_URI: ${{ secrets.WEB_ECR_IMAGE_URI }}
+        run: |
+          docker buildx build \
+            --platform linux/amd64,linux/arm64 \
+            -t $IMAGE_URI:$IMAGE_TAG \
+            -t $IMAGE_URI:latest \
+            -f ./TEKDB/Dockerfile ./TEKDB \
+            --push
+
+      - name: Build, tag, and push proxy Docker image to ECR
+        id: build-proxy-image
+        env:
+          IMAGE_TAG: ${{ github.sha }}
+          IMAGE_URI: ${{ secrets.PROXY_ECR_IMAGE_URI }}
+        run: |
+          docker buildx build \
+            --platform linux/amd64,linux/arm64 \
+            -t $IMAGE_URI:$IMAGE_TAG \
+            -t $IMAGE_URI:latest \
+            -f ./proxy/Dockerfile ./proxy \
+            --push
+      - name: get EC2 Instance ID
+        id: get-instance
+        run: |
+          INSTANCE_ID=$(aws ec2 describe-instances \
+            --filters "Name=tag:Name,Values=${{ secrets.EC2_INSTANCE_NAME }}" \
+                      "Name=instance-state-name,Values=running" \
+            --query "Reservations[0].Instances[0].InstanceId" \
+            --output text)
+          echo "instance_id=$INSTANCE_ID" >> $GITHUB_OUTPUT
+      - name: Deploy via SSM
+        id: ssm-deploy
+        run: |
+          COMMAND_ID=$(aws ssm send-command \
+            --instance-ids "${{ steps.get-instance.outputs.instance_id }}" \
+            --document-name "AWS-RunShellScript" \
+            --parameters 'commands=[
+              "aws ecr get-login-password --region ${{ secrets.AWS_REGION }} | sudo docker login --username AWS --password-stdin ${{ secrets.WEB_ECR_IMAGE_URI }}",
+              "sudo docker pull ${{ secrets.WEB_ECR_IMAGE_URI }}:latest",
+              "aws ecr get-login-password --region ${{ secrets.AWS_REGION }} | sudo docker login --username AWS --password-stdin ${{ secrets.PROXY_ECR_IMAGE_URI }}",
+              "sudo docker pull ${{ secrets.PROXY_ECR_IMAGE_URI }}:latest",
+              "cd /TEKDB",
+              "sudo docker compose down",
+              "docker compose --env-file docker/.env.prod -f docker/docker-compose.prod.yaml up -d",
+              "sleep 5",
+              "docker ps --filter name=web --format \"{{.Status}}\""
+            ]' \
+            --timeout-seconds 120 \
+            --comment "Deploy ${{ github.sha }}" \
+            --query "Command.CommandId" \
+            --output text)
+          echo "command_id=$COMMAND_ID" >> $GITHUB_OUTPUT
+      - name: Wait for deployment to complete
+        run: |
+          aws ssm wait command-executed \
+            --command-id ${{ steps.ssm-deploy.outputs.command_id }} \
+            --instance-id ${{ steps.get-instance.outputs.instance_id }}
+      - name: Verify deployment result
+        run: |
+          RESULT=$(aws ssm get-command-invocation \
+            --command-id ${{ steps.ssm-deploy.outputs.command_id }} \
+            --instance-id ${{ steps.get-instance.outputs.instance_id }} \
+            --query "{Status:Status,Output:StandardOutputContent,Error:StandardErrorContent}" \
+            --output json)
+          echo "$RESULT" | jq .
+          STATUS=$(echo "$RESULT" | jq -r '.Status')
+          if [ "$STATUS" != "Success" ]; then
+            echo "::error::Deployment failed with status: $STATUS"
+            exit 1
+          fi
+          echo "Deployment succeeded."

.gitignore

@@ -86,6 +86,7 @@ celerybeat-schedule
 
 # dotenv
 .env
+.env.prod
 
 # virtualenv
 venv/
@@ -98,4 +99,10 @@ ENV/
 .ropeproject
 
 #vscode settings
-.vscode/
+.vscode/
+
+# OpenTofu/Terraform
+.terraform/
+terraform.tfstate
+terraform.tfstate.backup
+*.tfvars

TEKDB/Dockerfile

@@ -42,5 +42,3 @@ ENV DJANGO_SETTINGS_MODULE=TEKDB.settings
 
 ENTRYPOINT ["/usr/local/bin/entrypoint.sh"]
 
-# use development server by default 
-CMD ["dev"]

TEKDB/TEKDB/settings.py

@@ -127,7 +127,7 @@
         "USER": os.environ.get("SQL_USER", "postgres"),
         "PASSWORD": os.environ.get("SQL_PASSWORD", None),
         "HOST": os.environ.get("SQL_HOST", "db"),
-        "PORT": os.environ.get("SQL_PORT", None),
+        "PORT": os.environ.get("SQL_PORT", 5432),
     }
 }
 

TEKDB/entrypoint.sh

@@ -32,8 +32,11 @@ if [ "$(python manage.py shell -c 'from TEKDB.models import LookupPlanningUnit;
 fi
 
 if [ "$1" = "prod" ]; then
-    echo "Starting uWSGI (HTTP) on :8000"
-    uwsgi --http :8000 --master --enable-threads --module TEKDB.wsgi
+    echo "Starting uWSGI (socket) on :8000"
+    uwsgi --socket :8000 --master --enable-threads --module TEKDB.wsgi
+elif [ "$1" = "prod-local" ]; then
+	echo "Starting uWSGI (http) on :8000 with local settings"
+	uwsgi --http :8000 --master --enable-threads --module TEKDB.wsgi
 elif [ "$1" = "dev" ]; then
     echo "Starting python development server on :8000"
     python manage.py runserver 0.0.0.0:8000

docker/docker-compose.yml → docker/common.yaml

@@ -16,7 +16,7 @@ services:
       interval: 10s
       timeout: 5s
       retries: 5
-
+  
   web:
     build:
       context: ../TEKDB/
@@ -26,20 +26,5 @@ services:
       - db
     env_file:
       - .env.dev
-    environment:
-      ALLOWED_HOSTS: ${ALLOWED_HOSTS}
-      DEBUG: ${DEBUG}
-      SQL_ENGINE: ${SQL_ENGINE}
-      SQL_HOST: ${SQL_HOST}
-      SQL_PORT: ${SQL_PORT}
-      SQL_DATABASE: ${SQL_DATABASE}
-      SQL_USER: ${SQL_USER}
-      SQL_PASSWORD: ${SQL_PASSWORD}
-      SECRET_KEY: ${SECRET_KEY}
     ports:
-      - "8000:8000"
-    volumes:
-      - ../TEKDB:/usr/src/app
-
-volumes:
-  tekdb_db_data:
+      - "8000:8000"

docker/docker-compose.prod.local.yaml

@@ -0,0 +1,34 @@
+services:
+  db:
+    extends:
+      file: common.yaml
+      service: db
+
+  web:
+    extends:
+      file: common.yaml
+      service: web
+    command: ["prod-local"]
+    env_file:
+      - .env.dev
+    ports: []
+    volumes:
+      - static_volume:/usr/src/app/static
+      - media_volume:/usr/src/app/media
+  proxy:
+    build:
+      context: ../proxy/
+      dockerfile: ../proxy/Dockerfile
+    restart: unless-stopped
+    depends_on:
+      - web
+    ports:
+      - "8080:8080"
+    volumes:
+      - static_volume:/vol/static/static:ro
+      - media_volume:/vol/static/media:ro
+
+volumes:
+  tekdb_db_data:
+  static_volume:
+  media_volume:

docker/docker-compose.prod.yaml

@@ -1,46 +1,33 @@
 services:
   db:
-    image: postgis/postgis:15-3.4
-    restart: always
-    platform: linux/amd64
-    environment:
-      POSTGRES_DB: ${SQL_DATABASE}
-      POSTGRES_USER: ${SQL_USER}
-      POSTGRES_PASSWORD: ${SQL_PASSWORD}
-    volumes:
-      - tekdb_db_data:/var/lib/postgresql/data
-    ports:
-      - "5432:5432"
-    healthcheck:
-      test: ["CMD-SHELL", "pg_isready -U ${SQL_USER} -d ${SQL_DATABASE} -h localhost -p ${SQL_PORT}"]
-      interval: 10s
-      timeout: 5s
-      retries: 5
+    extends:
+      file: common.yaml
+      service: db
 
   web:
-    build:
-      context: ../TEKDB/
-      dockerfile: ../TEKDB/Dockerfile
+    extends:
+      file: common.yaml
+      service: web
+    image: ${ITKDB_ECR_PATH}:latest
     command: ["prod"]
+    env_file:
+      - .env.prod
+    ports: []
+    volumes:
+      - static_volume:/usr/src/app/static
+      - media_volume:/usr/src/app/media
+  proxy:
+    image: ${ITKDB_PROXY_ECR_PATH}:latest
     restart: unless-stopped
     depends_on:
-      - db
-    env_file:
-      - .env.dev
-    environment:
-      ALLOWED_HOSTS: ${ALLOWED_HOSTS}
-      DEBUG: ${DEBUG}
-      SQL_ENGINE: ${SQL_ENGINE}
-      SQL_HOST: ${SQL_HOST}
-      SQL_PORT: ${SQL_PORT}
-      SQL_DATABASE: ${SQL_DATABASE}
-      SQL_USER: ${SQL_USER}
-      SQL_PASSWORD: ${SQL_PASSWORD}
-      SECRET_KEY: ${SECRET_KEY}
+      - web
     ports:
-      - "8000:8000"
+      - "80:8080"
     volumes:
-      - ../TEKDB:/usr/src/app
+      - static_volume:/vol/static/static:ro
+      - media_volume:/vol/static/media:ro
 
 volumes:
   tekdb_db_data:
+  static_volume:
+  media_volume: