From e118165bfb405f515d10ed525531c6bc0aea5e3b Mon Sep 17 00:00:00 2001 From: lovasoa Date: Fri, 2 Aug 2024 00:45:10 +0200 Subject: [PATCH] mssql update in tests --- db-test-setup/mssql/Dockerfile | 2 +- db-test-setup/mssql/entrypoint.sh | 2 +- docker-compose.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/db-test-setup/mssql/Dockerfile b/db-test-setup/mssql/Dockerfile index bd1d56ff..f0a25691 100644 --- a/db-test-setup/mssql/Dockerfile +++ b/db-test-setup/mssql/Dockerfile @@ -1,4 +1,4 @@ -ARG VERSION=2019-latest +ARG VERSION=2022-latest FROM mcr.microsoft.com/mssql/server:${VERSION} # Create a config directory diff --git a/db-test-setup/mssql/entrypoint.sh b/db-test-setup/mssql/entrypoint.sh index 56f1c018..c3166af0 100644 --- a/db-test-setup/mssql/entrypoint.sh +++ b/db-test-setup/mssql/entrypoint.sh @@ -7,7 +7,7 @@ pid=$! sleep 15 # Run the setup script to create the DB and the schema in the DB -/opt/mssql-tools/bin/sqlcmd -S localhost -U sa -P "$SA_PASSWORD" -d master -i setup.sql +/opt/mssql-tools18/bin/sqlcmd -S localhost -U sa -P "$SA_PASSWORD" -d master -i setup.sql -No # Wait for sqlservr to exit wait -n $pid diff --git a/docker-compose.yml b/docker-compose.yml index f714c1cb..f807284c 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -35,7 +35,7 @@ services: ports: ["1433:1433"] build: { context: "db-test-setup/mssql" } healthcheck: - test: /opt/mssql-tools/bin/sqlcmd -S localhost -U root -P "Password123!" -Q "SELECT 1" -b -o /dev/null + test: /opt/mssql-tools18/bin/sqlcmd -S localhost -U root -P "Password123!" -Q "SELECT 1" -b -o /dev/null -No interval: 10s timeout: 3s retries: 10