Skip to content

Commit d2996aa

Browse files
mocsharpmocsharp
committed
Update dev settings & package versions
Signed-off-by: Victor Chang <[email protected]>
1 parent f1ea110 commit d2996aa

8 files changed

+108
-18
lines changed

‎.gitignore

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
*.db
2121
*.db-*
2222
src/InformaticsGateway/payloads
23-
23+
.run/
2424
# docfx temp files
2525
_site/
2626

@@ -559,4 +559,4 @@ FodyWeavers.xsd
559559
### VisualStudio Patch ###
560560
# Additional files built by Visual Studio
561561

562-
# End of https://www.toptal.com/developers/gitignore/api/aspnetcore,dotnetcore,visualstudio,visualstudiocode
562+
# End of https://www.toptal.com/developers/gitignore/api/aspnetcore,dotnetcore,visualstudio,visualstudiocode

‎docker-compose/docker-compose.dev.yml

Lines changed: 71 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,71 @@
1+
# Copyright 2022 MONAI Consortium
2+
#
3+
# Licensed under the Apache License, Version 2.0 (the "License");
4+
# you may not use this file except in compliance with the License.
5+
# You may obtain a copy of the License at
6+
#
7+
# http://www.apache.org/licenses/LICENSE-2.0
8+
#
9+
# Unless required by applicable law or agreed to in writing, software
10+
# distributed under the License is distributed on an "AS IS" BASIS,
11+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
# See the License for the specific language governing permissions and
13+
# limitations under the License.
14+
15+
version: "3.7"
16+
services:
17+
rabbitmq:
18+
image: rabbitmq:3-management
19+
hostname: rabbitmq
20+
ports:
21+
- 5672:5672
22+
- 15672:15672
23+
environment:
24+
RABBITMQ_DEFAULT_USER: "rabbitmq"
25+
RABBITMQ_DEFAULT_PASS: "rabbitmq"
26+
RABBITMQ_DEFAULT_VHOST: "monaideploy"
27+
RABBITMQ_ERLANG_COOKIE: "SWQOKODSQALRPCLNMEQG"
28+
29+
healthcheck:
30+
test: rabbitmq-diagnostics -q ping
31+
interval: 15s
32+
timeout: 30s
33+
retries: 3
34+
35+
minio:
36+
image: "minio/minio:latest"
37+
command: server --console-address ":9001" /data
38+
hostname: minio
39+
volumes:
40+
- ./.run/minio/data:/data
41+
- ./.run/minio/config:/root/.minio
42+
ports:
43+
- "9000:9000"
44+
environment:
45+
MINIO_ROOT_USER: minioadmin
46+
MINIO_ROOT_PASSWORD: minioadmin
47+
healthcheck:
48+
test: ["CMD", "curl", "-f", "http://localhost:9000/minio/health/live"]
49+
interval: 15s
50+
timeout: 30s
51+
retries: 3
52+
53+
createbuckets:
54+
image: minio/mc
55+
environment:
56+
MINIO_ROOT_USER: minioadmin
57+
MINIO_ROOT_PASSWORD: minioadmin
58+
BUCKET_NAME: monaideploy
59+
ENDPOINT: http://minio:9000
60+
depends_on:
61+
minio:
62+
condition: service_healthy
63+
entrypoint: >
64+
/bin/sh -c "
65+
until (/usr/bin/mc config host add myminio $$ENDPOINT $$MINIO_ROOT_USER $$MINIO_ROOT_PASSWORD) do echo '...waiting...' && sleep 1; done;
66+
/usr/bin/mc mb myminio/$$BUCKET_NAME;
67+
/usr/bin/mc policy set public myminio/$$BUCKET_NAME;
68+
/usr/bin/mc ls myminio;
69+
# exit 0
70+
"
71+

‎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.7" />
3333
<PackageReference Include="Monai.Deploy.Messaging" Version="0.1.3-rc0010" />
34-
<PackageReference Include="Monai.Deploy.Storage" Version="0.2.0-rc0012" />
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.3-rc0010" />
34-
<PackageReference Include="Monai.Deploy.Storage" Version="0.2.0-rc0012" />
34+
<PackageReference Include="Monai.Deploy.Storage" Version="0.2.0-rc0014" />
3535
<PackageReference Include="System.IO.Abstractions" Version="17.0.24" />
3636
</ItemGroup>
3737

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

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<!--
1+
<!--
22
~ Copyright 2022 MONAI Consortium
33
~
44
~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -46,7 +46,9 @@
4646
<PackageReference Include="Microsoft.Extensions.Logging" Version="6.0.0" />
4747
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="6.0.0" />
4848
<PackageReference Include="Microsoft.Extensions.Options" Version="6.0.0" />
49-
<PackageReference Include="Monai.Deploy.Storage" Version="0.2.0-rc0012" />
49+
<PackageReference Include="Monai.Deploy.Messaging.RabbitMQ" Version="0.1.3-rc0010" />
50+
<PackageReference Include="Monai.Deploy.Storage" Version="0.2.0-rc0014" />
51+
<PackageReference Include="Monai.Deploy.Storage.MinIO" Version="0.2.0-rc0014" />
5052
<PackageReference Include="Polly" Version="7.2.3" />
5153
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.4.0" />
5254
</ItemGroup>
@@ -79,4 +81,20 @@
7981
<None Include="./appsettings.json" CopyToOutputDirectory="Always" />
8082
<None Include="./appsettings.Development.json" CopyToOutputDirectory="Always" />
8183
</ItemGroup>
84+
85+
<Target Name="CopyPlugins" AfterTargets="AfterPublish">
86+
<ItemGroup>
87+
<PluginDlls Include="$(PublishDir)Monai.Deploy.Messaging.RabbitMQ.dll;$(PublishDir)Monai.Deploy.Storage.MinIO.dll;$(PublishDir)Minio.dll" />
88+
</ItemGroup>
89+
<Copy SourceFiles="@(PluginDlls)" DestinationFolder="$(PublishDir)\plug-ins\" SkipUnchangedFiles="true" />
90+
<Message Text="Files copied successfully to $(PublishDir)\plug-ins\." Importance="high" />
91+
</Target>
92+
93+
<Target Name="CopyPluginsBuild" AfterTargets="Build">
94+
<ItemGroup>
95+
<PluginDlls Include="$(OutDir)Monai.Deploy.Messaging.RabbitMQ.dll;$(OutDir)Monai.Deploy.Storage.MinIO.dll;$(OutDir)Minio.dll" />
96+
</ItemGroup>
97+
<Copy SourceFiles="@(PluginDlls)" DestinationFolder="$(OutDir)\plug-ins\" SkipUnchangedFiles="true" />
98+
<Message Text="Files copied successfully to $(OutDir)\plug-ins\." Importance="high" />
99+
</Target>
82100
</Project>

‎src/InformaticsGateway/appsettings.Development.json

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,27 +11,28 @@
1111
},
1212
"messaging": {
1313
"publisherSettings": {
14-
"endpoint": "10.110.54.121",
15-
"username": "mdig",
16-
"password": "gidm",
14+
"endpoint": "localhost",
15+
"username": "rabbitmq",
16+
"password": "rabbitmq",
1717
"virtualHost": "monaideploy",
1818
"exchange": "monaideploy"
1919
},
2020
"subscriberSettings": {
21-
"endpoint": "10.110.54.121",
22-
"username": "mdig",
23-
"password": "gidm",
21+
"endpoint": "localhost",
22+
"username": "rabbitmq",
23+
"password": "rabbitmq",
2424
"virtualHost": "monaideploy",
2525
"exchange": "monaideploy",
2626
"exportRequestQueue": "export_tasks"
2727
}
2828
},
2929
"storage": {
3030
"temporary": "./payloads",
31+
"bucketName": "monaideploy",
3132
"settings": {
32-
"endpoint": "10.105.3.254",
33-
"accessKey": "minio",
34-
"accessToken": "monaideploy",
33+
"endpoint": "localhost",
34+
"accessKey": "minioadmin",
35+
"accessToken": "minioadmin",
3536
"securedConnection": false
3637
}
3738
}

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

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

‎tests/Integration.Test/Monai.Deploy.InformaticsGateway.Integration.Test.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
3434
<PackageReference Include="Minio" Version="4.0.5" />
3535
<PackageReference Include="Monai.Deploy.Messaging.RabbitMQ" Version="0.1.3-rc0010" />
36-
<PackageReference Include="Monai.Deploy.Storage.MinIO" Version="0.2.0-rc0012" />
36+
<PackageReference Include="Monai.Deploy.Storage.MinIO" Version="0.2.0-rc0014" />
3737
<PackageReference Include="Moq" Version="4.18.1" />
3838
<PackageReference Include="Polly" Version="7.2.3" />
3939
<PackageReference Include="RabbitMQ.Client" Version="6.4.0" />

0 commit comments

Comments
 (0)