STARIONGROUP
diff --git a/‎.github/workflows/CodeQuality.yml‎
Lines changed: 48 additions & 0 deletions b/‎.github/workflows/CodeQuality.yml‎
Lines changed: 48 additions & 0 deletions
diff --git a/‎.github/workflows/codeql-analysis.yml‎
Lines changed: 51 additions & 0 deletions b/‎.github/workflows/codeql-analysis.yml‎
Lines changed: 51 additions & 0 deletions
diff --git a/‎.github/workflows/publish-docker-container.yml‎
Lines changed: 29 additions & 0 deletions b/‎.github/workflows/publish-docker-container.yml‎
Lines changed: 29 additions & 0 deletions
diff --git a/‎.gitignore‎
Lines changed: 6 additions & 0 deletions b/‎.gitignore‎
Lines changed: 6 additions & 0 deletions
diff --git a/‎Docker-images/SearchService/Dockerfile‎
Lines changed: 5 additions & 0 deletions b/‎Docker-images/SearchService/Dockerfile‎
Lines changed: 5 additions & 0 deletions
diff --git a/‎Docker-images/SearchService/Plugins/CometSearch.Common.dll‎
101 KB b/‎Docker-images/SearchService/Plugins/CometSearch.Common.dll‎
101 KB
diff --git a/‎Docker-images/SearchService/Plugins/UI_DSM.Shared.dll‎
70 KB b/‎Docker-images/SearchService/Plugins/UI_DSM.Shared.dll‎
70 KB
diff --git a/‎Docker-images/SearchService/README‎
Lines changed: 32 additions & 0 deletions b/‎Docker-images/SearchService/README‎
Lines changed: 32 additions & 0 deletions
diff --git a/‎Dockerfile‎
Lines changed: 30 additions & 0 deletions b/‎Dockerfile‎
Lines changed: 30 additions & 0 deletions
diff --git a/‎Nuget.Config‎
Lines changed: 3 additions & 3 deletions b/‎Nuget.Config‎
Lines changed: 3 additions & 3 deletions
@@ -0,0 +1,48 @@
+name: Build & Test & SonarQube
+
+on:
+  push:
+  pull_request:
+    types: [opened, synchronize, reopened]
+    
+jobs:
+  build:
+    name: Build
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          fetch-depth: 0  # Shallow clones should be disabled for a better relevancy of analysis
+
+      - name: Setup .NET Core
+        uses: actions/setup-dotnet@v1
+        with:
+          dotnet-version: '6.0.x'
+
+      - name: add DevExpress nuget feed
+        run: dotnet nuget add source https://nuget.devexpress.com/api -n DXFeed -u DevExpress -p ${{ secrets.DEVEXPRESS_NUGET_KEY }} --store-password-in-clear-text
+
+      - name: add Gitlab Generic Platform nuget feed
+        run: dotnet nuget add source https://gitlab.esa.int/api/v4/projects/7524/packages/nuget/index.json --store-password-in-clear-text -n generic-platform-feed -u ${{ secrets.GP_NUGET_USER }} -p ${{ secrets.GP_NUGET_KEY }}
+
+      - name: Restore dependencies
+        run: dotnet restore UI_DSM.sln
+        
+      - name: Sonarqube Begin
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}  # Needed to get PR information, if any
+          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
+        run: |
+          dotnet tool install --global dotnet-sonarscanner
+          dotnet sonarscanner begin /k:"RHEAGROUP_UI-DSM" /o:"rheagroup" /d:sonar.login="${{ secrets.SONAR_TOKEN }}" /d:sonar.host.url="https://sonarcloud.io" /d:sonar.cs.opencover.reportsPaths="./CoverageResults/coverage.opencover.xml"
+
+      - name: Build
+        run: dotnet build UI_DSM.sln --no-restore /p:ContinuousIntegrationBuild=true
+
+      - name: Test with the dotnet CLI
+        run: dotnet test UI_DSM.sln --no-build --verbosity normal --filter FullyQualifiedName!~IntegrationTests /p:CollectCoverage=true /p:CoverletOutput="../CoverageResults/" /p:MergeWith="../CoverageResults/coverage.json" /p:CoverletOutputFormat=\"opencover,json\" -m:1
+        
+      - name: Sonarqube end
+        run: dotnet sonarscanner end /d:sonar.login="${{ secrets.SONAR_TOKEN }}"
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -0,0 +1,51 @@
+name: "CodeQL"
+
+on:
+  push:
+  pull_request:
+  schedule:
+    - cron: '42 2 * * 3'
+
+jobs:
+  analyze:
+    name: Analyze
+    runs-on: ubuntu-latest
+    permissions:
+      actions: read
+      contents: read
+      security-events: write
+
+    strategy:
+      fail-fast: false
+      matrix:
+        language: [ 'csharp' ]
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v3
+
+    - name: Setup .NET Core
+      uses: actions/setup-dotnet@v1
+      with:
+        dotnet-version: 6.0.x
+
+    # Initializes the CodeQL tools for scanning.
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v2
+      with:
+        languages: ${{ matrix.language }}
+
+    - name: add DevExpress nuget feed
+      run: dotnet nuget add source https://nuget.devexpress.com/api -n DXFeed -u DevExpress -p ${{ secrets.DEVEXPRESS_NUGET_KEY }} --store-password-in-clear-text
+
+    - name: add Gitlab Genric Platform nuget feed
+      run: dotnet nuget add source https://gitlab.esa.int/api/v4/projects/7524/packages/nuget/index.json --store-password-in-clear-text -n generic-platform-feed -u ${{ secrets.GP_NUGET_USER }} -p ${{ secrets.GP_NUGET_KEY }}
+
+    - name: Install dependencies
+      run: dotnet restore UI_DSM.sln
+
+    - name: Build
+      run: dotnet build UI_DSM.sln --no-restore
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v2
@@ -0,0 +1,29 @@
+name: Publish UI-DSM Docker Container
+
+on:
+  push:
+    tags:
+      - '*'
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+    - name: checkout branch
+      uses: actions/checkout@v3
+      
+    - name: Login to DockerHub Registry
+      run: echo ${{ secrets.DOCKERHUB_PASSWORD }} | docker login -u ${{ secrets.DOCKERHUB_USERNAME }} --password-stdin
+      
+    - name: Get the version
+      id: vars
+      run: echo ::set-output name=tag::${GITHUB_REF#refs/*/}
+      
+    - name: Build the Docker image and tag
+      run: DOCKER_BUILDKIT=1 docker build -f Dockerfile -t rheagroup/ui-dsm:latest -t rheagroup/ui-dsm:${{ steps.vars.outputs.tag }} .
+      
+    - name: push $RELEASE_VERSION tag
+      run: docker push rheagroup/ui-dsm:${{ steps.vars.outputs.tag }}
+      
+    - name: push latest tag
+      run: docker push rheagroup/ui-dsm:latest
@@ -9,6 +9,7 @@
 *.user
 *.userosscache
 *.sln.docstates
+*.vscode
 
 # User-specific files (MonoDevelop/Xamarin Studio)
 *.userprefs
@@ -348,3 +349,8 @@ MigrationBackup/
 
 # Ionide (cross platform F# VS Code tools) working folder
 .ionide/
+
+Storage/
+.env
+/UI_DSM.Server/Reports/Generic/DSReport.rep4
+/UI_DSM.Server/Reports/Generic/MassBudget-ENVISION-Summary.rep4
@@ -0,0 +1,5 @@
+# syntax=docker/dockerfile:1.4
+
+FROM gitlab.esa.int:4567/rhea-generic-platform/rhea-generic-platform/gp-search-service:0.1.1
+
+COPY Docker-images/SearchService/Plugins /app/Plugins
@@ -0,0 +1,32 @@
+UI-DSM Search Service container application
+
+# Build and Deploy using Docker
+
+The UI-DSM Search Service container is built using docker and docker buildkit and the result is a Docker container ready to be deployed (or pushed to a Docker registry). The Docker file is located in the Docker-images/SearchService project folder.
+
+> The Docker command needs to be executed from the commandline in the **solution** folder. 
+
+For docker login, create a (ui-dsm_framework) project level access token. 
+
+```
+$ ./solutionfolder# docker login gitlab.esa.int:4567
+$ ./solutionfolder# docker build -f Docker-images/SearchService/Dockerfile -t rheagroup/ui-dsm-search-service:latest -t rheagroup/ui-dsm-search-service:<version> . 
+```
+
+Run the container in local environment
+
+```
+docker run -p 2222:80 -it -d --name ui-dsm-search-service --net uidsm-net rheagroup/ui-dsm-search-service:latest
+```
+
+Push to docker registry
+
+```
+$ ./solutionfolder# docker push rheagroup/ui-dsm-search-service:latest
+$ ./solutionfolder# docker push rheagroup/ui-dsm-search-service:<specific-version>
+```
+
+# License
+
+Copyright (c) 2022 RHEA S.A.
+The UI-DSM Search Service is provided to the community under the Apache License 2.0.
@@ -0,0 +1,30 @@
+#See https://aka.ms/containerfastmode to understand how Visual Studio uses this Dockerfile to build your images for faster debugging.
+FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build
+
+WORKDIR /src
+COPY ["UI_DSM.Server", "UI_DSM.Server/"]
+COPY ["UI_DSM.Client", "UI_DSM.Client/"]
+COPY ["UI_DSM.Serializer.Json", "UI_DSM.Serializer.Json/"]
+COPY ["UI_DSM.Shared", "UI_DSM.Shared/"]
+
+RUN --mount=type=secret,id=envConfig . /run/secrets/envConfig \
+ && dotnet nuget add source https://nuget.devexpress.com/api -n DXFeed -u DevExpress -p ${DEVEXPRESS_NUGET_KEY} --store-password-in-clear-text \ 
+ && dotnet nuget add source https://gitlab.esa.int/api/v4/projects/7524/packages/nuget/index.json -n GPFeed -u ${GP_NUGET_USER} -p ${GP_NUGET_TOKEN} --store-password-in-clear-text \ 
+ && dotnet restore "UI_DSM.Server/UI_DSM.Server.csproj"
+ 
+WORKDIR "/src/UI_DSM.Server"
+RUN dotnet build --no-restore "UI_DSM.Server.csproj" -c Release -o /app/build
+
+FROM build AS publish
+RUN dotnet publish "UI_DSM.Server.csproj" -c Release -o /app/publish /p:UseAppHost=false
+
+FROM mcr.microsoft.com/dotnet/aspnet:6.0 AS final
+WORKDIR /app
+COPY --from=publish /app/publish .
+COPY ["UI_DSM.Server/Reports", "storage/"]
+
+RUN apt update
+RUN apt install -y libc6 -f -o APT::Immediate-Configure=0 
+RUN apt install -y libicu-dev libharfbuzz0b libfontconfig1 libfreetype6 libosmesa6 libglu1-mesa
+
+ENTRYPOINT ["dotnet", "UI_DSM.Server.dll"]
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
+  <clear />
   <packageSources>
-    <clear />    
-	<add key="api.nuget.org" value="https://api.nuget.org/v3/index.json" />
+    <add key="api.nuget.org" value="https://api.nuget.org/v3/index.json" />
   </packageSources>
-</configuration>
+</configuration>