Migrate to SqlServer 2019

giis-uniovi · Sep 20, 2024 · 48be25e · 48be25e
1 parent 7935975
commit 48be25e
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -58,7 +58,7 @@ jobs:
             -e TEST_SQLSERVER_PWD="$TEST_SQLSERVER_PWD" \
             -e "ACCEPT_EULA=Y" -e "MSSQL_PID=Developer" \
             -v ${GITHUB_WORKSPACE}/setup/sqlserver:/setup.d \
-            mcr.microsoft.com/mssql/server:2017-latest
+            mcr.microsoft.com/mssql/server:2019-latest
           chmod u+x setup/wait-container-ready.sh && ./setup/wait-container-ready.sh test-sqlserver "SQL Server is now ready for client connections"
           # SQLServer does not have an on startup script, run it now
           docker exec test-sqlserver bash -c "chmod u+x setup.d/sqlserver-setup.sh && ./setup.d/sqlserver-setup.sh"     
@@ -158,7 +158,7 @@ jobs:
             -e TEST_SQLSERVER_PWD="$TEST_SQLSERVER_PWD" \
             -e "ACCEPT_EULA=Y" -e "MSSQL_PID=Developer" \
             -v ${GITHUB_WORKSPACE}/setup/sqlserver:/setup.d \
-            mcr.microsoft.com/mssql/server:2017-latest
+            mcr.microsoft.com/mssql/server:2019-latest
           chmod u+x ../setup/wait-container-ready.sh && ../setup/wait-container-ready.sh test-sqlserver "SQL Server is now ready for client connections"
           # SQLServer does not have an on startup script, run it now
           docker exec test-sqlserver bash -c "chmod u+x setup.d/sqlserver-setup.sh && ./setup.d/sqlserver-setup.sh"     

diff --git a/setup/container-setup.sh b/setup/container-setup.sh
@@ -33,7 +33,7 @@ docker run -d -p 1433:1433 --name test-sqlserver  --restart unless-stopped \
   -e TEST_SQLSERVER_PWD="$TEST_SQLSERVER_PWD" \
   -e "ACCEPT_EULA=Y" -e "MSSQL_PID=Developer" \
   -v /${PWD}/sqlserver:/setup.d \
-  mcr.microsoft.com/mssql/server:2017-latest
+  mcr.microsoft.com/mssql/server:2019-latest
 ./wait-container-ready.sh test-sqlserver "SQL Server is now ready for client connections"
 # SQLServer does not have an on startup script, run it now
 docker exec test-sqlserver bash -c "./setup.d/sqlserver-setup.sh"

diff --git a/setup/sqlserver/sqlserver-setup.sh b/setup/sqlserver/sqlserver-setup.sh
@@ -1,14 +1,14 @@
 # Execution of sqlserver commands after startup
 # A little bit flaky in GitHub, check first connection and wait if fails
 echo "-- Try first connection"
-if ! /opt/mssql-tools/bin/sqlcmd -S localhost,1433 -U sa -P $TEST_SQLSERVER_PWD -l 30 -Q "select name from sys.databases"; then
+if ! /opt/mssql-tools18/bin/sqlcmd -C -S localhost,1433 -U sa -P $TEST_SQLSERVER_PWD -l 30 -Q "select name from sys.databases"; then
   echo "Failure to connect from sa, wait some time"
   sleep 4
   echo "End sleep, going to setup"
   #this seems to solve login failure, but sometimes: Error: Process completed with exit code 137.
 fi
 echo "-- Begin setup"
-/opt/mssql-tools/bin/sqlcmd -S localhost,1433 -U sa -P $TEST_SQLSERVER_PWD -l 30  <<-EOSQL
+/opt/mssql-tools18/bin/sqlcmd -C -S localhost,1433 -U sa -P $TEST_SQLSERVER_PWD -l 30  <<-EOSQL
   CREATE LOGIN tdclirdb WITH PASSWORD = '$TEST_SQLSERVER_PWD', CHECK_POLICY=OFF, CHECK_EXPIRATION=OFF, DEFAULT_LANGUAGE=spanish;
   GO
   CREATE DATABASE tdclirdb