From 5cd3df135350bf3b93cd2c6ec54eb6a79441d3cf Mon Sep 17 00:00:00 2001
From: Brian Kroth <bpkroth@microsoft.com>
Date: Mon, 30 Sep 2024 19:38:11 +0000
Subject: [PATCH] try again

---
 .github/workflows/maven.yml                | 4 ++--
 docker/sqlserver-latest/docker-compose.yml | 4 ++--
 docker/sqlserver-latest/up.sh              | 9 +++++++++
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index 392529e65..0307d7801 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -636,9 +636,9 @@ jobs:
           SA_PASSWORD: SApassword1
         options: >-
           --health-cmd "/opt/mssql-tools/bin/sqlcmd -S localhost -U sa -P SApassword1 -b -Q 'SELECT 1;'"
-          --health-interval 10s
+          --health-interval 5s
           --health-timeout 5s
-          --health-retries 5
+          --health-retries 60
           --health-start-period 5s
         ports:
           - 1433:1433
diff --git a/docker/sqlserver-latest/docker-compose.yml b/docker/sqlserver-latest/docker-compose.yml
index 5b5f99863..eec4f9193 100644
--- a/docker/sqlserver-latest/docker-compose.yml
+++ b/docker/sqlserver-latest/docker-compose.yml
@@ -8,9 +8,9 @@ services:
     image: mcr.microsoft.com/mssql/server:latest
     healthcheck:
       test: ["CMD", "/opt/mssql-tools/bin/sqlcmd", "-S", "localhost", "-U", "sa", "-P", "SApassword1", "-b", "-Q", "SELECT 1;"]
-      interval: 10s
+      interval: 5s
       timeout: 5s
-      retries: 5
+      retries: 30
       start_period: 5s
     environment:
       ACCEPT_EULA: Y
diff --git a/docker/sqlserver-latest/up.sh b/docker/sqlserver-latest/up.sh
index a6bf942d9..dcb15e257 100755
--- a/docker/sqlserver-latest/up.sh
+++ b/docker/sqlserver-latest/up.sh
@@ -11,6 +11,15 @@ network=$(docker ps --format "{{.Names}} {{.Networks}}" | awk '( $1 ~ /^'$BENCHB
 # Also setup the database for use with the sample configs.
 # See Also: .github/workflows/maven.yml
 
+# Wait until ready
+for i in {1..60}; do
+    if /usr/bin/docker inspect --format="{{print .State.Health.Status}}" sqlserver | grep -q -x healthy; then
+        break
+    else
+        sleep 5
+    fi
+done
+
 function run_sqlcmd_in_docker() {
     set -x
     docker run --rm --network=$network --entrypoint /opt/mssql-tools/bin/sqlcmd mcr.microsoft.com/mssql-tools:latest \