Skip to content

Commit 8a27918

Browse files
neildsouthneildsouth
committed
fixing up docker issues from dev environment
Signed-off-by: Neil South <[email protected]>
1 parent b9b2112 commit 8a27918

13 files changed

+163
-73
lines changed

‎Dockerfile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,8 @@ COPY --from=build /tools /opt/dotnetcore-tools
4747
EXPOSE 104
4848
EXPOSE 5000
4949

50+
RUN mkdir /database/
51+
5052
RUN ls -lR /opt/monai/ig
5153
ENV PATH="/opt/dotnetcore-tools:${PATH}"
5254

‎src/Api/Monai.Deploy.InformaticsGateway.Api.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
<PackageReference Include="Macross.Json.Extensions" Version="3.0.0" />
3232
<PackageReference Include="Microsoft.EntityFrameworkCore.Abstractions" Version="6.0.6" />
3333
<PackageReference Include="Monai.Deploy.Messaging" Version="0.1.2" />
34-
<PackageReference Include="Monai.Deploy.Storage" Version="0.1.1" />
34+
<PackageReference Include="Monai.Deploy.Storage" Version="0.2.0-rc0014" />
3535
<PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
3636
</ItemGroup>
3737

‎src/Configuration/Monai.Deploy.InformaticsGateway.Configuration.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.1" />
3232
<PackageReference Include="Microsoft.Extensions.Options" Version="6.0.0" />
3333
<PackageReference Include="Monai.Deploy.Messaging" Version="0.1.2" />
34-
<PackageReference Include="Monai.Deploy.Storage" Version="0.1.1" />
34+
<PackageReference Include="Monai.Deploy.Storage" Version="0.2.0-rc0014" />
3535
<PackageReference Include="System.IO.Abstractions" Version="17.0.18" />
3636
</ItemGroup>
3737

‎src/InformaticsGateway/Monai.Deploy.InformaticsGateway.csproj

Lines changed: 27 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,10 @@
4545
<PackageReference Include="Microsoft.Extensions.Logging" Version="6.0.0" />
4646
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="6.0.0" />
4747
<PackageReference Include="Microsoft.Extensions.Options" Version="6.0.0" />
48-
<PackageReference Include="Monai.Deploy.Storage" Version="0.1.1" />
48+
<PackageReference Include="Monai.Deploy.Messaging.RabbitMQ" Version="0.2.0-rc0046" />
49+
<PackageReference Include="Monai.Deploy.Storage" Version="0.2.0-rc0014" />
50+
<PackageReference Include="Monai.Deploy.Storage.MinIO" Version="0.2.0-rc0014" />
51+
<PackageReference Include="Monai.Deploy.Storage.S3Policy" Version="0.2.0-rc0014" />
4952
<PackageReference Include="Polly" Version="7.2.3" />
5053
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.3.1" />
5154
</ItemGroup>
@@ -78,4 +81,27 @@
7881
<None Include="./appsettings.json" CopyToOutputDirectory="Always" />
7982
<None Include="./appsettings.Development.json" CopyToOutputDirectory="Always" />
8083
</ItemGroup>
84+
85+
<ItemGroup>
86+
<None Update="appsettings.Local.json">
87+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
88+
</None>
89+
</ItemGroup>
90+
91+
<Target Name="CopyPlugins" AfterTargets="publish">
92+
<ItemGroup>
93+
<PluginDlls Include="$(PublishDir)Monai.Deploy.Messaging.RabbitMQ.dll;$(PublishDir)Monai.Deploy.Storage.MinIO.dll" />
94+
</ItemGroup>
95+
<Copy SourceFiles="@(PluginDlls)" DestinationFolder="$(PublishDir)\plug-ins\" SkipUnchangedFiles="true" />
96+
<Message Text="Files copied successfully to $(PublishDir)\plug-ins\." Importance="high" />
97+
</Target>
98+
99+
<Target Name="CopyPluginsBuild" AfterTargets="build">
100+
<ItemGroup>
101+
<PluginDlls Include="$(OutDir)Monai.Deploy.Messaging.RabbitMQ.dll;$(OutDir)Monai.Deploy.Storage.MinIO.dll" />
102+
</ItemGroup>
103+
<Copy SourceFiles="@(PluginDlls)" DestinationFolder="$(OutDir)\plug-ins\" SkipUnchangedFiles="true" />
104+
<Message Text="Files copied successfully to $(OutDir)\plug-ins\." Importance="high" />
105+
</Target>
106+
81107
</Project>

‎src/InformaticsGateway/Program.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,8 @@ internal static IHostBuilder CreateHostBuilder(string[] args) =>
7676
var env = builderContext.HostingEnvironment;
7777
config
7878
.AddJsonFile("appsettings.json", optional: false, reloadOnChange: true)
79-
.AddJsonFile($"appsettings.{env.EnvironmentName}.json", optional: true, reloadOnChange: true);
79+
.AddJsonFile($"appsettings.{env.EnvironmentName}.json", optional: true, reloadOnChange: true)
80+
.AddEnvironmentVariables();
8081
})
8182
.ConfigureLogging((builderContext, configureLogging) =>
8283
{

‎src/InformaticsGateway/Properties/launchSettings.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"Monai.Deploy.InformaticsGateway": {
44
"commandName": "Project",
55
"environmentVariables": {
6-
"DOTNET_ENVIRONMENT": "Development"
6+
"DOTNET_ENVIRONMENT": "Local"
77
}
88
}
99
}

‎src/InformaticsGateway/appsettings.Local.json

Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
1+
{
2+
"ConnectionStrings": {
3+
"InformaticsGatewayDatabase": "Data Source=migdev.db"
4+
},
5+
"InformaticsGateway": {
6+
"dicom": {
7+
"scp": {
8+
"port": 1104,
9+
"rejectUnknownSources": false
10+
}
11+
},
12+
"messaging": {
13+
"publisherSettings": {
14+
"endpoint": "localhost",
15+
"username": "admin",
16+
"password": "admin",
17+
"port": "30072",
18+
"virtualHost": "monaideploy",
19+
"exchange": "monaideploy"
20+
},
21+
"subscriberSettings": {
22+
"endpoint": "localhost",
23+
"username": "admin",
24+
"password": "admin",
25+
"port": "30072",
26+
"virtualHost": "monaideploy",
27+
"exchange": "monaideploy",
28+
"exportRequestQueue": "export_tasks"
29+
}
30+
},
31+
"storage": {
32+
"temporary": "./payloads",
33+
"settings": {
34+
"endpoint": "minio:9000",
35+
"accessKey": "admin",
36+
"accessToken": "password",
37+
"securedConnection": false
38+
}
39+
}
40+
},
41+
"Logging": {
42+
"LogLevel": {
43+
"Dicom": "Information",
44+
"Monai": "Debug",
45+
"Microsoft": "Information",
46+
"Microsoft.EntityFrameworkCore": "Warning",
47+
"Microsoft.Hosting.Lifetime": "Information",
48+
"Microsoft.AspNetCore.Mvc.Infrastructure.ControllerActionInvoker": "Information"
49+
},
50+
"Console": {
51+
"FormatterName": "Simple",
52+
"FormatterOptions": {
53+
"ColorBehavior": "Enabled",
54+
"IncludeScopes": true,
55+
"SingleLine": false,
56+
"TimestampFormat": " HH:mm:ss ",
57+
"UseUtcTimestamp": false
58+
}
59+
}
60+
}
61+
}

‎tests/Integration.Test/Features/AcrApi.feature.cs

Lines changed: 7 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎tests/Integration.Test/Features/DicomDimseScp.feature.cs

Lines changed: 25 additions & 25 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎tests/Integration.Test/Features/DicomDimseScu.feature.cs

Lines changed: 5 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎tests/Integration.Test/Features/DicomWebExport.feature.cs

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)