Release/0.4.1

.dockerignore

@@ -73,4 +73,9 @@ bld/
 # files ending in .cache can be ignored
 *.[Cc]ache
 # but keep track of directories ending in .cache
-!*.[Cc]ache/
+!*.[Cc]ache/
+
+docker-compose/
+doc
+guidlines
+tests

.editorconfig

@@ -1,4 +1,4 @@
-# Copyright 2022 MONAI Consortium
+# Copyright 2022-2023 MONAI Consortium
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -18,7 +18,7 @@
 root = true
 
 # Copyright File Header
-file_header_template                = SPDX-FileCopyrightText: � [year file created] - [last year file modified], MONAI Consortium\nSPDX-License-Identifier: Apache License 2.0
+file_header_template                = SPDX-FileCopyrightText: © [year file created] - [last year file modified], MONAI Consortium\nSPDX-License-Identifier: Apache License 2.0
 dotnet_diagnostic.IDE0073.severity  = error
 
 # Default settings:
@@ -309,3 +309,7 @@ max_line_length                 = 88
 [*.json]
 indent_size                     = 2
 insert_final_newline            = ignore
+
+
+# Spelling
+spelling_error_severity         = information

.github/.gitversion.yml

@@ -29,4 +29,4 @@ branches:
 ignore:
   sha: []
 merge-message-formats: {}
-next-version: 0.3.14
+next-version: 0.3.17

.github/workflows/ci.yml

@@ -1,4 +1,4 @@
-# Copyright 2021-2022 MONAI Consortium
+# Copyright 2021-2023 MONAI Consortium
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -39,6 +39,7 @@ jobs:
       semVer: ${{ steps.gitversion.outputs.semVer }}
       preReleaseLabel: ${{ steps.gitversion.outputs.preReleaseLabel }}
       majorMinorPatch: ${{ steps.gitversion.outputs.majorMinorPatch }}
+      nuGetVersionV2: ${{ steps.gitversion.outputs.nuGetVersionV2 }}
 
     steps:
       - uses: actions/checkout@v3
@@ -255,7 +256,7 @@ jobs:
     timeout-minutes: 30
     strategy:
       matrix:
-        feature: [AcrApi, DicomDimseScp, DicomDimseScu, DicomWebExport, DicomWebStow, HealthLevel7, Fhir]
+        feature: [AcrApi, DicomDimseScp, DicomDimseScu, DicomWebExport, DicomWebStow, HealthLevel7, Fhir, RemoteAppExecutionPlugIn]
         database: [ef, mongodb]
       fail-fast: false
     env:
@@ -308,6 +309,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     needs: [calc-version]
     env:
+      NUGETVER: ${{ needs.calc-version.outputs.nuGetVersionV2 }}
       SEMVER: ${{ needs.calc-version.outputs.semVer }}
       PRERELEASELABEL: ${{ needs.calc-version.outputs.preReleaseLabel }}
       MAJORMINORPATCH: ${{ needs.calc-version.outputs.majorMinorPatch }}
@@ -388,8 +390,24 @@ jobs:
           path: ~/release
           retention-days: 7
 
+      - name: Package API
+        if: ${{ (matrix.os == 'ubuntu-latest') }}
+        run: |
+          mkdir ~/nupkg
+          dotnet pack --no-build -c ${{ env.BUILD_CONFIG }} -o ~/nupkg -p:PackageVersion=${{ env.NUGETVER }}
+          ls -lR ~/nupkg
+        working-directory: ./src/Api
+
+      - name: Upload Nuget
+        if: ${{ matrix.os == 'ubuntu-latest' }}
+        uses: actions/[email protected]
+        with:
+          name: nuget
+          path: ~/nupkg
+          retention-days: 30
+
       - name: Log in to the Container registry
-        uses: docker/login-action@v2.1.0
+        uses: docker/login-action@v2.2.0
         if: ${{ (matrix.os == 'ubuntu-latest') }}
         with:
           registry: ${{ env.REGISTRY }}
@@ -398,7 +416,7 @@ jobs:
 
       - name: Extract metadata (tags, labels) for Docker
         id: meta
-        uses: docker/metadata-action@v4.3.0
+        uses: docker/metadata-action@v4.6.0
         if: ${{ (matrix.os == 'ubuntu-latest') }}
         with:
           images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
@@ -407,7 +425,7 @@ jobs:
             type=raw,value=latest,enable=${{ endsWith(github.ref, github.event.repository.default_branch) }}
 
       - name: Build and push Docker image
-        uses: docker/build-push-action@v4.0.0
+        uses: docker/build-push-action@v4.1.1
         if: ${{ (matrix.os == 'ubuntu-latest') }}
         with:
           context: .
@@ -425,7 +443,7 @@ jobs:
 
       - name: Anchore container scan
         id: anchore-scan
-        uses: anchore/[email protected].5
+        uses: anchore/[email protected].6
         if: ${{ (matrix.os == 'ubuntu-latest') }}
         with:
           image: ${{ fromJSON(steps.meta.outputs.json).tags[0] }}
@@ -501,6 +519,31 @@ jobs:
           name: artifacts
           path: ~/release
           retention-days: 7
+
+  publish:
+    name: Publish to GitHub Packages
+    runs-on: ubuntu-latest
+    needs: [build, unit-test, integration-test]
+    if: ${{ ! ( github.event.inputs.nuget ) && ! ( contains(github.ref, 'refs/heads/main') ) }}
+    steps:
+      - uses: actions/download-artifact@v3
+        id: download
+
+      - name: List artifacts
+        run: ls -ldR ${{steps.download.outputs.download-path}}/**/*
+
+      - name: Install grp
+        run: dotnet tool install gpr -g
+
+      - uses: actions/setup-dotnet@v3
+        env:
+          NUGET_AUTH_TOKEN: ${{secrets.GITHUB_TOKEN}}
+        with:
+          dotnet-version: "6.0.x"
+          source-url: https://nuget.pkg.github.com/Project-MONAI/index.json
+
+      - name: Publish to GitHub
+        run: gpr push '${{ steps.download.outputs.download-path }}/nuget/*.nupkg' --repository ${{ github.repository }} -k ${{ secrets.GITHUB_TOKEN }}
 
   release:
     if: ${{ contains(github.ref, 'refs/heads/main') || contains(github.ref, 'refs/heads/develop') ||contains(github.head_ref, 'release/') || contains(github.head_ref, 'feature/') || contains(github.head_ref, 'develop') }}
@@ -521,6 +564,22 @@ jobs:
 
       - name: List artifacts
         run: ls -ldR ${{steps.download.outputs.download-path}}/**/*
+
+      - name: Install grp
+        run: dotnet tool install gpr -g
+
+      - uses: actions/setup-dotnet@v3
+        env:
+          NUGET_AUTH_TOKEN: ${{secrets.GITHUB_TOKEN}}
+        with:
+          dotnet-version: "6.0.x"
+          source-url: https://nuget.pkg.github.com/Project-MONAI/index.json
+
+      - name: Publish to GitHub
+        run: gpr push '${{ steps.download.outputs.download-path }}/nuget/*.nupkg' --repository ${{ github.repository }} -k ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Publish to NuGet.org
+        run: dotnet nuget push  ${{ steps.download.outputs.download-path }}/nuget/*.nupkg -s https://api.nuget.org/v3/index.json --api-key ${{ secrets.NUGET }} --skip-duplicate
 
       - name: Extract owner and repo
         uses: jungwinter/split@v2

.github/workflows/package-cleanup.yml

@@ -0,0 +1,58 @@
+# Copyright 2021-2023 MONAI Consortium
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+
+
+name: Cleanup Pre-release Packages
+
+on:
+  schedule:
+  - cron: "0 0 * * *"
+  workflow_dispatch:
+
+jobs:
+  nuget-api-prerelease-cleanup:
+    name: pre-release Monai.Deploy.InformaticsGateway.Api
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/delete-package-versions@v4
+      with: 
+        package-name: 'Monai.Deploy.InformaticsGateway.Api'
+        package-type: nuget
+        min-versions-to-keep: 10
+        delete-only-pre-release-versions: "true"
+
+  container-prerelease-cleanup:
+    name: delete pre-release monai-deploy-informatics-gateway
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/delete-package-versions@v4
+      with: 
+        package-name: 'monai-deploy-informatics-gateway'
+        package-type: container
+        min-versions-to-keep: 10
+        delete-only-pre-release-versions: "true"
+        ignore-versions: '^0\.[\d]+\.[\d]+$'
+
+  container-untagged-cleanup:
+    name: delete untagged monai-deploy-informatics-gateway
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/delete-package-versions@v4
+      with: 
+        package-name: 'monai-deploy-informatics-gateway'
+        package-type: container
+        min-versions-to-keep: 0
+        delete-only-untagged-versions: "true"
+

.licenserc.yaml

@@ -31,6 +31,7 @@ header:
     - 'src/coverlet.runsettings'
     - 'src/Monai.Deploy.InformaticsGateway.sln'
     - 'src/Database/EntityFramework/Migrations/**'
+    - 'src/Plug-ins/RemoteAppExecution/Migrations/**'
     - 'demos/**/.env/**'
     - 'demos/**/*.txt'
     - 'doc/dependency_decisions.yml'

.trivyignore

@@ -0,0 +1,19 @@
+# Copyright 2023 MONAI Consortium
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# https://github.com/Project-MONAI/monai-deploy-informatics-gateway/issues/450
+CVE-2018-8292
+
+# https://github.com/Project-MONAI/monai-deploy-informatics-gateway/issues/451
+CVE-2019-0820