From 087eaae26782a3008f8b1aa5bd34ce394e8f94e3 Mon Sep 17 00:00:00 2001
From: ROHIT <rohitchawda4241@gmail.com>
Date: Sun, 19 Jul 2026 17:47:04 +0530
Subject: [PATCH 1/4] fix cicd

---
 .github/workflows/ci.yml | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 5968875..d519ff2 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -2,9 +2,9 @@ name: CI/CD Pipeline
 
 on:
   push:
-    branches: [ "main" ]
+    branches: [ "main", "master" ]
   pull_request:
-    branches: [ "main" ]
+    branches: [ "main", "master" ]
 
 jobs:
   build-and-test:
@@ -16,6 +16,17 @@ jobs:
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
 
+      - name: Prepare environment for Docker Compose
+        env:
+          DATABASE_URL: ${{ secrets.DATABASE_URL }}
+          FIREBASE_CREDENTIALS: ${{ secrets.FIREBASE_CREDENTIALS }}
+        run: |
+          mkdir -p env_todo2
+          echo "DATABASE_URL=$DATABASE_URL" > env_todo2/.env
+          echo "FIREBASE_CREDENTIALS=$FIREBASE_CREDENTIALS" >> env_todo2/.env
+          mkdir -p ~/AppData/Roaming/gcloud/
+          echo "{}" > ~/AppData/Roaming/gcloud/application_default_credentials.json
+
       - name: Build Docker Compose Services
         run: docker-compose build
 

From 0b896406c9c18ff71750846356aa39ad5d3fe64e Mon Sep 17 00:00:00 2001
From: ROHIT <rohitchawda4241@gmail.com>
Date: Sun, 19 Jul 2026 17:55:56 +0530
Subject: [PATCH 2/4] ok

---
 .github/workflows/ci.yml | 4 ++--
 docker-compose.yml       | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index d519ff2..b9d6098 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -24,8 +24,8 @@ jobs:
           mkdir -p env_todo2
           echo "DATABASE_URL=$DATABASE_URL" > env_todo2/.env
           echo "FIREBASE_CREDENTIALS=$FIREBASE_CREDENTIALS" >> env_todo2/.env
-          mkdir -p ~/AppData/Roaming/gcloud/
-          echo "{}" > ~/AppData/Roaming/gcloud/application_default_credentials.json
+          mkdir -p ~/.config/gcloud/
+          echo "{}" > ~/.config/gcloud/application_default_credentials.json
 
       - name: Build Docker Compose Services
         run: docker-compose build
diff --git a/docker-compose.yml b/docker-compose.yml
index a61c861..3ebfc78 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -15,7 +15,7 @@ services:
       - env_todo2/.env
     volumes:
       - .:/app # Optional: for hot reloading if you run uvicorn inside docker with --reload
-      - ~/AppData/Roaming/gcloud/application_default_credentials.json:/tmp/keys/application_default_credentials.json:ro
+      - ~/.config/gcloud/application_default_credentials.json:/tmp/keys/application_default_credentials.json:ro
 
   db:
     image: postgres:15-alpine

From 8e4058bfb544919d40c96cb89858625448a1d26b Mon Sep 17 00:00:00 2001
From: ROHIT <rohitchawda4241@gmail.com>
Date: Sun, 19 Jul 2026 17:57:58 +0530
Subject: [PATCH 3/4] fix10

---
 .github/workflows/ci.yml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index b9d6098..62da077 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -16,6 +16,11 @@ jobs:
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
 
+      - name: Install Docker Compose
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y docker-compose
+
       - name: Prepare environment for Docker Compose
         env:
           DATABASE_URL: ${{ secrets.DATABASE_URL }}

From 70161564a7834106a96313091092bca90380180a Mon Sep 17 00:00:00 2001
From: ROHIT <rohitchawda4241@gmail.com>
Date: Sun, 19 Jul 2026 18:11:20 +0530
Subject: [PATCH 4/4] idk

---
 .github/workflows/ci.yml | 30 ++++++------------------------
 docker-compose.yml       |  2 +-
 2 files changed, 7 insertions(+), 25 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 62da077..43bf3c7 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -16,29 +16,11 @@ jobs:
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
 
-      - name: Install Docker Compose
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y docker-compose
+      - name: Build Docker Image
+        uses: docker/build-push-action@v5
+        with:
+          context: .
+          push: false
+          tags: todo2-app:ci
 
-      - name: Prepare environment for Docker Compose
-        env:
-          DATABASE_URL: ${{ secrets.DATABASE_URL }}
-          FIREBASE_CREDENTIALS: ${{ secrets.FIREBASE_CREDENTIALS }}
-        run: |
-          mkdir -p env_todo2
-          echo "DATABASE_URL=$DATABASE_URL" > env_todo2/.env
-          echo "FIREBASE_CREDENTIALS=$FIREBASE_CREDENTIALS" >> env_todo2/.env
-          mkdir -p ~/.config/gcloud/
-          echo "{}" > ~/.config/gcloud/application_default_credentials.json
-
-      - name: Build Docker Compose Services
-        run: docker-compose build
-
-      - name: Start Services (Dry Run)
-        run: docker-compose up -d
-
-      - name: Check Running Containers
-        run: docker ps
-        
       # TODO: Add your custom deployment step here dependent on where you host (e.g., SSH, Render Deploy Hook, etc.)
diff --git a/docker-compose.yml b/docker-compose.yml
index 3ebfc78..e91282b 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -26,7 +26,7 @@ services:
     volumes:
       - postgres_data:/var/lib/postgresql/data
     healthcheck:
-      test: [ "CMD-SHELL", "pg_isready -U ritz -d todo2_db" ]
+      test: ["CMD-SHELL", "pg_isready -U ${POSTGRES_USER} -d ${POSTGRES_DB}"]
       interval: 5s
       timeout: 5s
       retries: 5