Stop using docker V1 command (#254)

* Stop using docker V1 per: actions/runner-images#9557 * Update to new tool location
OpenMAQS · Aug 18, 2024 · e02d292 · e02d292
1 parent 57c3f38
commit e02d292
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 15 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -273,7 +273,7 @@ jobs:
           dotnet-version: |
             8.x.x
       - name: Build the docker-compose stack
-        run: docker-compose -f Docker/MAQSMongoDB/docker-compose.yml -p OpenMAQS/maqs-dotnet up -d
+        run: docker compose -f Docker/MAQSMongoDB/docker-compose.yml -p openmaqs_maqs-dotnet up -d
       - id: builder
         uses: ./.github/workflows/buildtest-action
         with:
@@ -300,7 +300,10 @@ jobs:
           dotnet-version: |
             8.x.x
       - name: Build the docker-compose stack
-        run: docker-compose -f Docker/MAQSSQLServer/docker-compose.yml -p OpenMAQS/maqs-dotnet up -d
+        run: docker compose -f Docker/MAQSSQLServer/docker-compose.yml -p openmaqs_maqs-dotnet up -d
+      - name: Wait for DB to come online
+        run: sleep 10s
+        shell: bash
       - id: builder
         uses: ./.github/workflows/buildtest-action
         with:
@@ -327,7 +330,7 @@ jobs:
           dotnet-version: |
             8.x.x
       - name: Build the docker-compose stack
-        run: docker-compose -f Docker/MAQSEmail/docker-compose.yml -p OpenMAQS/maqs-dotnet up -d
+        run: docker compose -f Docker/MAQSEmail/docker-compose.yml -p openmaqs_maqs-dotnet up -d
       - id: builder
         uses: ./.github/workflows/buildtest-action
         with:
@@ -423,9 +426,9 @@ jobs:
       - id: browserupdate
         uses: ./.github/workflows/setuplinbrowser-action
       - name: Build the docker-compose mongo stack
-        run: docker-compose -f Docker/MAQSMongoDB/docker-compose.yml -p OpenMAQS/maqs-dotnet up -d
+        run: docker compose -f Docker/MAQSMongoDB/docker-compose.yml -p openmaqs_maqs-dotnet up -d
       - name: Build the docker-compose email stack
-        run: docker-compose -f Docker/MAQSEmail/docker-compose.yml -p OpenMAQS/maqs-dotnet up -d
+        run: docker compose -f Docker/MAQSEmail/docker-compose.yml -p openmaqs_maqs-dotnet up -d
       - id: builder
         uses: ./.github/workflows/buildtest-action
         with:

diff --git 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,15 +18,15 @@
 
     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"
 }&
 

diff --git a/Framework/Parallel.RunSettings b/Framework/Parallel.RunSettings
@@ -6,7 +6,7 @@
   </RunConfiguration>
   <MSTest>
     <Parallelize>
-      <Workers>4</Workers>
+      <Workers>3</Workers>
       <Scope>MethodLevel</Scope>
     </Parallelize>
   </MSTest>