Skip to content

Commit 4e0bb21

Browse files
authored
Release 0.3.0 (#144)
* Implement FHIR server (#118) * Integrate MS Health Check Service (#130) Signed-off-by: Victor Chang <[email protected]>
1 parent 3f59e89 commit 4e0bb21

File tree

85 files changed

+17209
-17646
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

85 files changed

+17209
-17646
lines changed

.github/dependabot.yml

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
# To get started with Dependabot version updates, you'll need to specify which
2+
# package ecosystems to update and where the package manifests are located.
3+
# Please see the documentation for all configuration options:
4+
# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
5+
6+
version: 2
7+
updates:
8+
- package-ecosystem: "nuget"
9+
directory: "/"
10+
schedule:
11+
interval: "weekly"
12+
open-pull-requests-limit: 5
13+
- package-ecosystem: "docker"
14+
directory: "/"
15+
schedule:
16+
interval: "weekly"
17+
open-pull-requests-limit: 5
18+
- package-ecosystem: "github-actions"
19+
directory: "/"
20+
schedule:
21+
interval: "weekly"
22+
open-pull-requests-limit: 5

.github/workflows/ci.yml

Lines changed: 39 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -41,11 +41,11 @@ jobs:
4141
majorMinorPatch: ${{ steps.gitversion.outputs.majorMinorPatch }}
4242

4343
steps:
44-
- uses: actions/checkout@v2
44+
- uses: actions/checkout@v3
4545
with:
4646
fetch-depth: 0
4747

48-
- uses: actions/setup-dotnet@v1
48+
- uses: actions/setup-dotnet@v2
4949
with:
5050
dotnet-version: "6.0.x"
5151

@@ -54,7 +54,7 @@ jobs:
5454

5555
- name: Determine Version
5656
id: gitversion
57-
uses: gittools/actions/gitversion/[email protected].11
57+
uses: gittools/actions/gitversion/[email protected].13
5858
with:
5959
useConfigFile: true
6060
configFilePath: .github/.gitversion.yml
@@ -72,11 +72,11 @@ jobs:
7272

7373
steps:
7474
- name: Checkout repository
75-
uses: actions/checkout@v2
75+
uses: actions/checkout@v3
7676
with:
7777
fetch-depth: 0
7878

79-
- uses: actions/setup-dotnet@v1
79+
- uses: actions/setup-dotnet@v2
8080
with:
8181
dotnet-version: "6.0.x"
8282

@@ -86,7 +86,7 @@ jobs:
8686
tools: licensefinder
8787

8888
- name: Enable NuGet cache
89-
uses: actions/cache@v2.1.7
89+
uses: actions/cache@v3.0.8
9090
with:
9191
path: ~/.nuget/packages
9292
key: ${{ runner.os }}-nuget-${{ hashFiles('**/packages.lock.json') }}
@@ -132,23 +132,24 @@ jobs:
132132
runs-on: ubuntu-latest
133133
steps:
134134
- name: Set up JDK 11
135-
uses: actions/setup-java@v1
135+
uses: actions/setup-java@v3
136136
with:
137-
java-version: 1.11
137+
distribution: zulu
138+
java-version: '11'
138139

139-
- uses: actions/setup-dotnet@v1
140+
- uses: actions/setup-dotnet@v2
140141
with:
141142
dotnet-version: "6.0.x"
142143

143144
- name: Enable NuGet cache
144-
uses: actions/cache@v2.1.7
145+
uses: actions/cache@v3.0.8
145146
with:
146147
path: ~/.nuget/packages
147148
key: ${{ runner.os }}-nuget-${{ hashFiles('**/packages.lock.json') }}
148149
restore-keys: |
149150
${{ runner.os }}-nuget
150151
151-
- uses: actions/checkout@v2
152+
- uses: actions/checkout@v3
152153
with:
153154
fetch-depth: 0
154155

@@ -188,7 +189,7 @@ jobs:
188189
run: dotnet sonarscanner end /d:sonar.login="${{ secrets.SONAR_TOKEN }}"
189190
working-directory: ./src
190191

191-
- uses: codecov/codecov-action@v2
192+
- uses: codecov/codecov-action@v3
192193
with:
193194
token: ${{ secrets.CODECOV_TOKEN }}
194195
directory: "src/${{ env.TEST_RESULTS }}"
@@ -204,22 +205,22 @@ jobs:
204205
needs: [build]
205206
strategy:
206207
matrix:
207-
feature: [AcrApi, DicomDimseScp, DicomDimseScu, DicomWebExport, DicomWebStow, HealthLevel7]
208+
feature: [AcrApi, DicomDimseScp, DicomDimseScu, DicomWebExport, DicomWebStow, HealthLevel7, Fhir]
208209
fail-fast: false
209210
env:
210211
TAG: ${{ needs.build.outputs.TAG }}
211212
steps:
212213
- name: Checkout repository
213-
uses: actions/checkout@v2
214+
uses: actions/checkout@v3
214215
with:
215216
fetch-depth: 0
216217

217-
- uses: actions/setup-dotnet@v1
218+
- uses: actions/setup-dotnet@v2
218219
with:
219220
dotnet-version: "6.0.x"
220221

221222
- name: Enable NuGet cache
222-
uses: actions/cache@v2.1.7
223+
uses: actions/cache@v3.0.8
223224
with:
224225
path: ~/.nuget/packages
225226
key: ${{ runner.os }}-nuget-${{ hashFiles('**/packages.lock.json') }}
@@ -241,7 +242,7 @@ jobs:
241242
popd
242243
243244
- name: Upload Integration Test Results
244-
uses: actions/upload-artifact@v2.3.1
245+
uses: actions/upload-artifact@v3.1.0
245246
if: always()
246247
with:
247248
name: integration-${{ matrix.feature }}
@@ -275,16 +276,16 @@ jobs:
275276

276277
steps:
277278
- name: Checkout repository
278-
uses: actions/checkout@v2
279+
uses: actions/checkout@v3
279280
with:
280281
fetch-depth: 0
281282

282-
- uses: actions/setup-dotnet@v1
283+
- uses: actions/setup-dotnet@v2
283284
with:
284285
dotnet-version: "6.0.x"
285286

286287
- name: Enable NuGet cache
287-
uses: actions/cache@v2.1.7
288+
uses: actions/cache@v3.0.8
288289
with:
289290
path: ~/.nuget/packages
290291
key: ${{ runner.os }}-nuget-${{ hashFiles('**/packages.lock.json') }}
@@ -320,14 +321,14 @@ jobs:
320321
dir -r ~/release
321322
322323
- name: Upload CLI
323-
uses: actions/upload-artifact@v2.3.1
324+
uses: actions/upload-artifact@v3.1.0
324325
with:
325326
name: artifacts
326327
path: ~/release
327328
retention-days: 7
328329

329330
- name: Log in to the Container registry
330-
uses: docker/login-action@v1.12.0
331+
uses: docker/login-action@v2.0.0
331332
if: ${{ (matrix.os == 'ubuntu-latest') }}
332333
with:
333334
registry: ${{ env.REGISTRY }}
@@ -336,7 +337,7 @@ jobs:
336337

337338
- name: Extract metadata (tags, labels) for Docker
338339
id: meta
339-
uses: docker/metadata-action@v3.6.2
340+
uses: docker/metadata-action@v4.0.1
340341
if: ${{ (matrix.os == 'ubuntu-latest') }}
341342
with:
342343
images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
@@ -345,7 +346,7 @@ jobs:
345346
type=raw,value=latest,enable=${{ endsWith(github.ref, github.event.repository.default_branch) }}
346347
347348
- name: Build and push Docker image
348-
uses: docker/build-push-action@v2.9.0
349+
uses: docker/build-push-action@v3.1.1
349350
if: ${{ (matrix.os == 'ubuntu-latest') }}
350351
with:
351352
context: .
@@ -363,7 +364,7 @@ jobs:
363364

364365
- name: Anchore container scan
365366
id: anchore-scan
366-
uses: anchore/[email protected].0
367+
uses: anchore/[email protected].5
367368
if: ${{ (matrix.os == 'ubuntu-latest') }}
368369
with:
369370
image: ${{ fromJSON(steps.meta.outputs.json).tags[0] }}
@@ -388,24 +389,24 @@ jobs:
388389
env:
389390
SEMVER: ${{ needs.calc-version.outputs.semVer }}
390391
steps:
391-
- uses: actions/checkout@v2
392+
- uses: actions/checkout@v3
392393
with:
393394
fetch-depth: 0
394395

395-
- uses: actions/setup-dotnet@v1
396+
- uses: actions/setup-dotnet@v2
396397
with:
397398
dotnet-version: "6.0.x"
398399

399400
- name: Enable NuGet cache
400-
uses: actions/cache@v2.1.7
401+
uses: actions/cache@v3.0.8
401402
with:
402403
path: ~/.nuget/packages
403404
key: ${{ runner.os }}-nuget-${{ hashFiles('**/packages.lock.json') }}
404405
restore-keys: |
405406
${{ runner.os }}-nuget
406407
407408
- name: Setup DocFX
408-
uses: crazy-max/ghaction-chocolatey@v1
409+
uses: crazy-max/ghaction-chocolatey@v2
409410
with:
410411
args: install docfx
411412

@@ -434,7 +435,7 @@ jobs:
434435
Get-ChildItem ~\release -Recurse
435436
436437
- name: Upload docs
437-
uses: actions/upload-artifact@v2.3.1
438+
uses: actions/upload-artifact@v3.1.0
438439
with:
439440
name: artifacts
440441
path: ~/release
@@ -450,30 +451,30 @@ jobs:
450451
MAJORMINORPATCH: ${{ needs.calc-version.outputs.majorMinorPatch }}
451452

452453
steps:
453-
- uses: actions/checkout@v2
454+
- uses: actions/checkout@v3
454455
with:
455456
fetch-depth: 0
456457

457-
- uses: actions/download-artifact@v2
458+
- uses: actions/download-artifact@v3
458459
id: download
459460

460461
- name: List artifacts
461462
run: ls -ldR ${{steps.download.outputs.download-path}}/**/*
462463

463464
- name: Extract owner and repo
464-
uses: jungwinter/split@v1
465+
uses: jungwinter/split@v2
465466
id: repo
466467
with:
467-
seperator: "/"
468+
separator: "/"
468469
msg: ${{ github.repository }}
469470

470471
- name: Install GitReleaseManager
471-
uses: gittools/actions/gitreleasemanager/[email protected].11
472+
uses: gittools/actions/gitreleasemanager/[email protected].13
472473
with:
473474
versionSpec: "0.13.x"
474475

475476
- name: Create release with GitReleaseManager
476-
uses: gittools/actions/gitreleasemanager/[email protected].11
477+
uses: gittools/actions/gitreleasemanager/[email protected].13
477478
with:
478479
token: ${{ secrets.GITHUB_TOKEN }}
479480
owner: ${{ steps.repo.outputs._0 }}
@@ -486,7 +487,7 @@ jobs:
486487
artifacts/mig-docs-${{ env.SEMVER }}.zip
487488
488489
- name: Publish release with GitReleaseManager
489-
uses: gittools/actions/gitreleasemanager/[email protected].11
490+
uses: gittools/actions/gitreleasemanager/[email protected].13
490491
if: ${{ contains(github.ref, 'refs/heads/main') }}
491492
with:
492493
token: ${{ secrets.GITHUB_TOKEN }}
@@ -495,7 +496,7 @@ jobs:
495496
tagName: ${{ env.MAJORMINORPATCH }}
496497

497498
- name: Close release with GitReleaseManager
498-
uses: gittools/actions/gitreleasemanager/[email protected].11
499+
uses: gittools/actions/gitreleasemanager/[email protected].13
499500
if: ${{ contains(github.ref, 'refs/heads/main') }}
500501
with:
501502
token: ${{ secrets.GITHUB_TOKEN }}

.licenserc.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ header:
2020
paths-ignore:
2121
- 'LICENSE'
2222
- '.github/**/*.md'
23+
- '.github/dependabot.yml'
2324
- '**/*.log'
2425
- '**/bin/**'
2526
- '**/obj/**'
@@ -33,6 +34,7 @@ header:
3334
- 'demos/**/.env/**'
3435
- 'docs/templates/**'
3536
- 'tests/Integration.Test/*.dev'
37+
- 'tests/Integration.Test/data/**'
3638

3739
comment: on-failure
3840

.vscode/launch.json

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,11 @@
1212
"type": "coreclr",
1313
"request": "launch",
1414
"preLaunchTask": "build-cli",
15-
"program": "${workspaceFolder}/src/CLI/bin/Debug/net5.0/linux-x64/mig-cli",
15+
"program": "${workspaceFolder}/src/CLI/bin/Debug/net6.0/linux-x64/mig-cli",
1616
"args": [
17-
"config",
18-
"endpoint",
19-
"http://localhost:4500"
17+
"start"
2018
],
21-
"cwd": "${workspaceFolder}/src/CLI/bin/Debug/net5.0/linux-x64",
19+
"cwd": "${workspaceFolder}/src/CLI/bin/Debug/net6.0/linux-x64",
2220
"stopAtEntry": true,
2321
"console": "internalConsole"
2422
},

Dockerfile

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
FROM mcr.microsoft.com/dotnet/sdk:6.0-focal as build
15+
FROM mcr.microsoft.com/dotnet/sdk:6.0-jammy as build
1616

1717
# Install the tools
1818
RUN dotnet tool install --tool-path /tools dotnet-trace
@@ -26,16 +26,15 @@ RUN echo "Building MONAI Deploy Informatics Gateway..."
2626
RUN dotnet publish -c Release -o out --nologo src/InformaticsGateway/Monai.Deploy.InformaticsGateway.csproj
2727

2828
# Build runtime image
29-
FROM mcr.microsoft.com/dotnet/aspnet:6.0-focal
29+
FROM mcr.microsoft.com/dotnet/aspnet:6.0-jammy
3030

3131
ENV DEBIAN_FRONTEND=noninteractive
3232
RUN apt-get clean \
3333
&& apt-get update \
3434
&& apt-get install -y --no-install-recommends \
35-
libssl1.1 \
36-
openssl \
3735
sqlite3 \
38-
&& rm -rf /var/lib/apt/lists
36+
curl \
37+
&& rm -rf /var/lib/apt/lists
3938

4039
WORKDIR /opt/monai/ig
4140

@@ -48,6 +47,8 @@ EXPOSE 104
4847
EXPOSE 2575
4948
EXPOSE 5000
5049

50+
HEALTHCHECK --interval=10s --retries=10 CMD curl --fail http://localhost:5000/health || exit 1
51+
5152
RUN ls -lR /opt/monai/ig
5253
ENV PATH="/opt/dotnetcore-tools:${PATH}"
5354

0 commit comments

Comments
 (0)