From c170c795d046134caa5f3dcc977b787dba25e580 Mon Sep 17 00:00:00 2001 From: Eugene Triguba Date: Mon, 13 Oct 2025 11:07:57 -0400 Subject: Consolidate build yml files and adjust sqlcmd path for 2017 mssql image --- scripts/lib/docker.sh | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'scripts') diff --git a/scripts/lib/docker.sh b/scripts/lib/docker.sh index 6a9f177..89a9beb 100644 --- a/scripts/lib/docker.sh +++ b/scripts/lib/docker.sh @@ -147,10 +147,16 @@ docker_start_mssql() { log_info "Starting MSSQL $version container '$container_name'..." + # MSSQL 2017 uses mssql-tools, 2019+ uses mssql-tools18 + local sqlcmd_path="/opt/mssql-tools18/bin/sqlcmd" + if [[ "$version" =~ ^2017 ]]; then + sqlcmd_path="/opt/mssql-tools/bin/sqlcmd" + fi + docker run --detach \ --name "$container_name" \ --publish 1433:1433 \ - --health-cmd "/opt/mssql-tools18/bin/sqlcmd -S localhost -U sa -P '$BOLT_MSSQL_SA_PASSWORD' -Q 'SELECT 1' -C || exit 1" \ + --health-cmd "$sqlcmd_path -S localhost -U sa -P '$BOLT_MSSQL_SA_PASSWORD' -Q 'SELECT 1' -C || exit 1" \ --health-interval 10s \ --health-timeout 3s \ --health-start-period 10s \ -- cgit v1.2.3