Fix loading TesseractEngine on Linux

.gitignore

@@ -20,7 +20,6 @@
 [Dd]ebugPublic/
 [Rr]elease/
 [Rr]eleases/
-x64/
 x86/
 bld/
 [Oo]bj/

.pre-commit-config.yaml

@@ -5,6 +5,10 @@ repos:
     hooks:
       # General
       - id: check-added-large-files
+        exclude: |
+          (?x)^(
+            src/SmiServices/runtimes/x64/.*|
+          )$
       - id: check-case-conflict
       - id: check-executables-have-shebangs
       - id: check-json

bin/common.py

@@ -114,6 +114,7 @@ def start_containers(
         "compose",
         "-f", compose_file,
         "up",
+        "--quiet-pull",
         "--detach",
         "--force-recreate",
     )
@@ -133,7 +134,8 @@ def start_containers(
         except subprocess.CalledProcessError:
             # NOTE(rkm 2022-03-01) Print container logs when a check fails
             cmd = (
-                f"{docker}-compose",
+                f"{docker}",
+                "compose",
                 "-f", compose_file,
                 "logs"
             )

bin/smi/startDockerLinux.py

@@ -33,7 +33,7 @@ def main() -> int:
             "rabbitmq rabbitmq-diagnostics -q ping",
             f"mariadb mysqladmin -uroot -p{args.db_password} status",
             "redis /usr/local/bin/redis-cli PING",
-            f"mssql /opt/mssql-tools/bin/sqlcmd -U sa -P {args.db_password} -l 1 -Q 'SELECT @@VERSION'",
+            f"mssql /opt/mssql-tools18/bin/sqlcmd -U sa -P {args.db_password} -No -l 1 -Q 'SELECT @@VERSION'",
             "mongodb /usr/bin/mongo --quiet --eval 'db.stats().ok'",
         ),
     )

news/1939-bugfix.md

@@ -0,0 +1 @@
+Fix loading of TesseractEngine on Linux

news/1940-bugfix.md

@@ -0,0 +1 @@
+Bump sqlserver to 2022 in CI to fix startup crash

src/SmiServices/SmiServices.csproj

@@ -27,4 +27,11 @@
         <PackageReference Include="System.IO.Abstractions" />
         <PackageReference Include="YamlDotNet" />
     </ItemGroup>
+    <ItemGroup>
+        <NativeLibs Include="$(MSBuildThisFileDirectory)runtimes\**\*.so" />
+        <None Include="@(NativeLibs)">
+            <Link>runtimes\%(RecursiveDir)%(FileName)%(Extension)</Link>
+            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+    </ItemGroup>
 </Project>

tests/SmiServices.UnitTests/Microservices/IsIdentifiable/TesseractStanfordDicomFileClassifierTests.cs

@@ -1,7 +1,9 @@
+using IsIdentifiable;
 using IsIdentifiable.Options;
 using NUnit.Framework;
 using SmiServices.Microservices.IsIdentifiable;
 using System.IO;
+using Tesseract;
 
 namespace SmiServices.UnitTests.Microservices.IsIdentifiable
 {
@@ -22,5 +24,20 @@ public void TestDataDirectory_Empty()
             d.Create();
             Assert.Throws<FileNotFoundException>(() => new TesseractStanfordDicomFileClassifier(d, new IsIdentifiableDicomFileOptions()));
         }
+
+        [Test]
+        [Platform(Exclude="Win")]
+        public void TesseractEngine_CanBeConstructed()
+        {
+            // Arrange
+            const string tessdataDirectory = @"../../../../../data/tessdata";
+            var d = new DirectoryInfo(tessdataDirectory);
+
+            TesseractLinuxLoaderFix.Patch();
+
+            // Act
+            // Assert
+            Assert.DoesNotThrow(() => new TesseractEngine(d.FullName, "eng", EngineMode.Default));
+        }
     }
 }

utils/docker-compose/linux-dotnet.yml

@@ -23,7 +23,7 @@ services:
       - 6379:6379
   mssql:
     container_name: mssql
-    image: mcr.microsoft.com/mssql/server:2017-latest
+    image: mcr.microsoft.com/mssql/server:2022-latest
     environment:
       - ACCEPT_EULA=Y
       - SA_PASSWORD=${DB_PASSWORD:-YourStrongPassw0rd}

utils/docker-compose/linux-dotnet.yml.lock

@@ -15,8 +15,8 @@
 			},
 			{
 				"name": "mcr.microsoft.com/mssql/server",
-				"tag": "2017-latest",
-				"digest": "c9832ca564c8410bf13a7d6276a0bf6f5d83d0f6a15c6a5004ba07a04bf93920",
+				"tag": "2022-latest",
+				"digest": "8ca3956bcb1f3373e5b04f946a527abb24c07655c2044bd5c9c8852d02fbec7c",
 				"service": "mssql"
 			},
 			{