Adding health check to sqlserver docker-compose and make it start 5 seconds after launching the container

.github/workflows/maven.yml

@@ -303,16 +303,16 @@ jobs:
           distribution: 'temurin'
 
       - name: Set up Python
-        uses: actions/setup-python@v5  
-        with:  
-          python-version: ${{env.PYTHON_VERSION}}  
+        uses: actions/setup-python@v5
+        with:
+          python-version: ${{env.PYTHON_VERSION}}
 
-      - name: Install Python dependencies  
+      - name: Install Python dependencies
         working-directory: ./scripts/anonymization
         run: |
           if [[ ${{matrix.benchmark}} == anonymization ]]; then
             python -m pip install --upgrade pip
-            pip install -r requirements.txt  
+            pip install -r requirements.txt
           else
             echo "Dependency installation not necessary for benchmark"
           fi
@@ -635,10 +635,11 @@ jobs:
           ACCEPT_EULA: Y
           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-cmd="find /opt/mssql-tools*/bin/ -name sqlcmd -executable -print -quit | xargs -t -I% sh -c '% -C -S localhost -U sa -P SApassword1 -b -Q \"SELECT 1;\"'"
+          --health-interval 5s
           --health-timeout 5s
           --health-retries 5
+          --health-start-period 5s
         ports:
           - 1433:1433
     steps:

docker/sqlserver-latest/docker-compose.yml

@@ -6,6 +6,12 @@ services:
     container_name: sqlserver
     hostname: sqlserver
     image: mcr.microsoft.com/mssql/server:latest
+    healthcheck:
+      test: ["CMD-SHELL", "find /opt/mssql-tools*/bin/ -name sqlcmd -executable -print -quit | xargs -t -I% sh -c '% -C -S localhost -U sa -P SApassword1 -b -Q \"SELECT 1;\"'"]
+      interval: 5s
+      timeout: 5s
+      retries: 5
+      start_period: 5s
     environment:
       ACCEPT_EULA: Y
       SA_PASSWORD: SApassword1

docker/sqlserver-latest/up.sh

@@ -6,11 +6,20 @@ cd "$scriptdir/"
 
 docker compose up -d
 
-network=$(docker ps --format "{{.Names}} {{.Networks}}" | awk '( $1 ~ /^'$BENCHBASE_PROFILE'/ ) { print $2 }')
+network=$(docker ps --format "{{.Names}} {{.Networks}}" | awk '( $1 ~ /^sqlserver/ ) { print $2 }')
 
 # 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 \