From 66dbe8a730fa70abe543f33e2ccb0a45a3eabbfa Mon Sep 17 00:00:00 2001
From: Taesu <166604494+bytaesu@users.noreply.github.com>
Date: Mon, 25 May 2026 08:05:18 +0900
Subject: [PATCH] chore(ci): stabilize docker startup (#9587)

---
 .github/workflows/ci.yml  | 14 ++++++++++++--
 .github/workflows/e2e.yml | 38 ++++++++++++++++++++++++++++++++++----
 docker-compose.yml        |  2 +-
 3 files changed, 47 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 86387c02a3..e5dada1ee5 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -171,14 +171,24 @@ jobs:
       - name: Rebuild native bindings for matrix node
         run: pnpm -r rebuild better-sqlite3
 
+      - name: Reset Docker Containers
+        run: docker compose down --volumes --remove-orphans
+
       - name: Start Docker Containers
         run: docker compose up -d --wait --wait-timeout 60
 
       - name: Test
         run: pnpm coverage
 
+      - name: Docker Compose Diagnostics
+        if: failure() && hashFiles('docker-compose.yml') != ''
+        run: |
+          docker compose ps --all || true
+          docker compose logs --no-color mssql || true
+
       - name: Stop Docker Containers
-        run: docker compose down
+        if: always() && hashFiles('docker-compose.yml') != ''
+        run: docker compose down --volumes --remove-orphans
 
   ci:
     runs-on: ubuntu-latest
@@ -187,4 +197,4 @@ jobs:
     steps:
       - uses: re-actors/alls-green@05ac9388f0aebcb5727afa17fcccfecd6f8ec5fe # v1.2.2
         with:
-          jobs: ${{ toJSON(needs) }}
\ No newline at end of file
+          jobs: ${{ toJSON(needs) }}
diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
index 1c1b927463..b21321945f 100644
--- a/.github/workflows/e2e.yml
+++ b/.github/workflows/e2e.yml
@@ -55,6 +55,9 @@ jobs:
       - name: Build
         run: pnpm build
 
+      - name: Reset Docker Containers
+        run: docker compose down --volumes --remove-orphans
+
       - name: Start Docker Containers
         run: docker compose up -d --wait --wait-timeout 60
 
@@ -67,8 +70,15 @@ jobs:
       - name: Smoke
         run: pnpm e2e:smoke
 
+      - name: Docker Compose Diagnostics
+        if: failure() && hashFiles('docker-compose.yml') != ''
+        run: |
+          docker compose ps --all || true
+          docker compose logs --no-color mssql || true
+
       - name: Stop Docker Containers
-        run: docker compose down
+        if: always() && hashFiles('docker-compose.yml') != ''
+        run: docker compose down --volumes --remove-orphans
   integration:
     name: Integration test
     timeout-minutes: 60
@@ -103,14 +113,24 @@ jobs:
       - name: Install Playwright Browsers
         uses: ./.github/actions/setup-playwright
 
+      - name: Reset Docker Containers
+        run: docker compose down --volumes --remove-orphans
+
       - name: Start Docker Containers
         run: docker compose up -d --wait --wait-timeout 60
 
       - name: Integration
         run: pnpm e2e:integration --filter=./e2e/integration
 
+      - name: Docker Compose Diagnostics
+        if: failure() && hashFiles('docker-compose.yml') != ''
+        run: |
+          docker compose ps --all || true
+          docker compose logs --no-color mssql || true
+
       - name: Stop Docker Containers
-        run: docker compose down
+        if: always() && hashFiles('docker-compose.yml') != ''
+        run: docker compose down --volumes --remove-orphans
   adapter-integration:
     name: ${{ matrix.packages }} Integration Test
     runs-on: ${{ github.repository == 'better-auth/better-auth' && 'starsling-ubuntu-24.04' || 'ubuntu-24.04' }}
@@ -145,6 +165,9 @@ jobs:
       - name: Install
         run: pnpm install
 
+      - name: Reset Docker Containers
+        run: docker compose down --volumes --remove-orphans
+
       - name: Start Docker Containers
         run: docker compose up -d --wait --wait-timeout 60
 
@@ -153,8 +176,15 @@ jobs:
           FILTER: ${{ matrix.packages }}
         run: pnpm e2e:integration --filter="$FILTER"
 
+      - name: Docker Compose Diagnostics
+        if: failure() && hashFiles('docker-compose.yml') != ''
+        run: |
+          docker compose ps --all || true
+          docker compose logs --no-color mssql || true
+
       - name: Stop Docker Containers
-        run: docker compose down
+        if: always() && hashFiles('docker-compose.yml') != ''
+        run: docker compose down --volumes --remove-orphans
 
   e2e:
     runs-on: ubuntu-latest
@@ -163,4 +193,4 @@ jobs:
     steps:
       - uses: re-actors/alls-green@05ac9388f0aebcb5727afa17fcccfecd6f8ec5fe # v1.2.2
         with:
-          jobs: ${{ toJSON(needs) }}
\ No newline at end of file
+          jobs: ${{ toJSON(needs) }}
diff --git a/docker-compose.yml b/docker-compose.yml
index 2ed5c0c9be..6e8eabf00b 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -147,7 +147,7 @@ services:
     image: mcr.microsoft.com/mssql/server:latest
     container_name: mssql
     environment:
-      SA_PASSWORD: "Password123!"
+      MSSQL_SA_PASSWORD: "Password123!"
       ACCEPT_EULA: "Y"
     ports:
       - "1433:1433"