From 96ea2631fc8a0b7a2a5cef88d64ffea1e1e5cfd0 Mon Sep 17 00:00:00 2001 From: Jon Reding Date: Tue, 20 Aug 2024 10:21:33 -0500 Subject: [PATCH 1/5] Update initialize_and_start_sqlserver.sh --- .../initialize_and_start_sqlserver.sh | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/docker/MAQSSQLServer/initialize_and_start_sqlserver.sh b/docker/MAQSSQLServer/initialize_and_start_sqlserver.sh index bd3f97f63..da99e46ca 100644 --- a/docker/MAQSSQLServer/initialize_and_start_sqlserver.sh +++ b/docker/MAQSSQLServer/initialize_and_start_sqlserver.sh @@ -6,7 +6,7 @@ while [ $not_ready != 0 ] do # Wait for the return code of the following statement to be zero - /opt/mssql-tools/bin/sqlcmd -S localhost -U sa -P globalMAQS2 -d master -Q "SELECT TOP 1 message_id FROM sys.messages" + /opt/mssql-tools18/bin/sqlcmd -S localhost -U sa -P globalMAQS2 -d master -C -Q "SELECT TOP 1 message_id FROM sys.messages" not_ready=$? if [ $not_ready != 0 ] @@ -18,17 +18,17 @@ echo "Started initializing database" # Set up the schema and stored procedures - /opt/mssql-tools/bin/sqlcmd -S localhost -U sa -P globalMAQS2 -d master -i `dirname $0`/schema.sql - /opt/mssql-tools/bin/sqlcmd -S localhost -U sa -P globalMAQS2 -d master -i `dirname $0`/stored_procedures.sql + /opt/mssql-tools18/bin/sqlcmd -S localhost -U sa -C -P globalMAQS2 -d master -i `dirname $0`/schema.sql + /opt/mssql-tools18/bin/sqlcmd -S localhost -U sa -C -P globalMAQS2 -d master -i `dirname $0`/stored_procedures.sql # Use BCP to import test data - /opt/mssql-tools/bin/bcp GlobalAutomation.dbo.States in "`dirname $0`/SeedData/GlobalAutomation/States.bcp" \ - -n -S localhost -U sa -P globalMAQS2 - /opt/mssql-tools/bin/bcp GlobalAutomation.dbo.Cities in "`dirname $0`/SeedData/GlobalAutomation/Cities.bcp" \ - -n -S localhost -U sa -P globalMAQS2 - /opt/mssql-tools/bin/bcp GlobalAutomation.dbo.Datatype in "`dirname $0`/SeedData/GlobalAutomation/Datatype.bcp" \ - -n -S localhost -U sa -P globalMAQS2 + /opt/mssql-tools18/bin/bcp GlobalAutomation.dbo.States in "`dirname $0`/SeedData/GlobalAutomation/States.bcp" \ + -n -u -S localhost -U sa -P globalMAQS2 + /opt/mssql-tools18/bin/bcp GlobalAutomation.dbo.Cities in "`dirname $0`/SeedData/GlobalAutomation/Cities.bcp" \ + -n -u -S localhost -U sa -P globalMAQS2 + /opt/mssql-tools18/bin/bcp GlobalAutomation.dbo.Datatype in "`dirname $0`/SeedData/GlobalAutomation/Datatype.bcp" \ + -n -u -S localhost -U sa -P globalMAQS2 echo "Finished initializing database" }& # Start SQL server -exec /opt/mssql/bin/sqlservr \ No newline at end of file +exec /opt/mssql/bin/sqlservr From e465b320ce2c69fd191138cd9f766884bc1aa096 Mon Sep 17 00:00:00 2001 From: Jon Reding Date: Tue, 20 Aug 2024 10:30:02 -0500 Subject: [PATCH 2/5] Update action.yml --- .github/actions/startdeps/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/startdeps/action.yml b/.github/actions/startdeps/action.yml index 70171efbf..ffa2edb86 100644 --- a/.github/actions/startdeps/action.yml +++ b/.github/actions/startdeps/action.yml @@ -22,4 +22,4 @@ runs: - name: Build the docker-compose stack if: inputs.module-name == 'openmaqs-database' shell: bash - run: docker-compose -f docker/MAQSSQLServer/docker-compose.yml -p OpenMAQS/openmaqs-java up -d + run: docker compose -f docker/MAQSSQLServer/docker-compose.yml -p OpenMAQS/openmaqs-java up -d From 2b6257eea8163f8c9208229d6fc26af11d7694e3 Mon Sep 17 00:00:00 2001 From: Jon Reding Date: Tue, 20 Aug 2024 10:42:27 -0500 Subject: [PATCH 3/5] Update action.yml --- .github/actions/startdeps/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/startdeps/action.yml b/.github/actions/startdeps/action.yml index ffa2edb86..e30661001 100644 --- a/.github/actions/startdeps/action.yml +++ b/.github/actions/startdeps/action.yml @@ -22,4 +22,4 @@ runs: - name: Build the docker-compose stack if: inputs.module-name == 'openmaqs-database' shell: bash - run: docker compose -f docker/MAQSSQLServer/docker-compose.yml -p OpenMAQS/openmaqs-java up -d + run: docker compose -f docker/MAQSSQLServer/docker-compose.yml -p openmaqs_maqs/openmaqs-java up -d From 50c78e2090935534da199c6778c743f5319d6cb2 Mon Sep 17 00:00:00 2001 From: Jon Reding Date: Tue, 20 Aug 2024 10:54:08 -0500 Subject: [PATCH 4/5] Update action.yml --- .github/actions/startdeps/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/startdeps/action.yml b/.github/actions/startdeps/action.yml index e30661001..f32ff57a0 100644 --- a/.github/actions/startdeps/action.yml +++ b/.github/actions/startdeps/action.yml @@ -22,4 +22,4 @@ runs: - name: Build the docker-compose stack if: inputs.module-name == 'openmaqs-database' shell: bash - run: docker compose -f docker/MAQSSQLServer/docker-compose.yml -p openmaqs_maqs/openmaqs-java up -d + run: docker compose -f docker/MAQSSQLServer/docker-compose.yml -p openmaqs/openmaqs-java up -d From e1df92d9bd1da1c48f830a5058d03bcf0439c039 Mon Sep 17 00:00:00 2001 From: Jon Reding Date: Tue, 20 Aug 2024 10:59:35 -0500 Subject: [PATCH 5/5] Update action.yml --- .github/actions/startdeps/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/startdeps/action.yml b/.github/actions/startdeps/action.yml index f32ff57a0..6e84ff4b2 100644 --- a/.github/actions/startdeps/action.yml +++ b/.github/actions/startdeps/action.yml @@ -22,4 +22,4 @@ runs: - name: Build the docker-compose stack if: inputs.module-name == 'openmaqs-database' shell: bash - run: docker compose -f docker/MAQSSQLServer/docker-compose.yml -p openmaqs/openmaqs-java up -d + run: docker compose -f docker/MAQSSQLServer/docker-compose.yml -p openmaqs-java up -d