disable SSR and make few more tweaks

This commit is contained in:
Volodymyr Smirnov 2020-10-27 20:05:24 +02:00
parent 931db11b6e
commit ce353a42dc
8 changed files with 16 additions and 35 deletions

View File

@ -5,4 +5,5 @@ bin
obj
dist
node_modules
.nuxt
.nuxt
MalwareMultiScan.Ui

View File

@ -1,16 +0,0 @@
FROM mcr.microsoft.com/dotnet/core/sdk:3.1 AS builder
WORKDIR /src
COPY MalwareMultiScan.Scanner /src/MalwareMultiScan.Scanner
COPY MalwareMultiScan.Backends /src/MalwareMultiScan.Backends
RUN dotnet publish -c Release -r linux-x64 -o ./publish MalwareMultiScan.Scanner/MalwareMultiScan.Scanner.csproj
FROM mcr.microsoft.com/dotnet/core/runtime:3.1
WORKDIR /worker
COPY --from=builder /src/publish /worker
ENTRYPOINT ["/worker/MalwareMultiScan.Scanner"]

View File

@ -27,8 +27,6 @@ namespace MalwareMultiScan.Backends.Backends.Implementations
private static async Task<string[]> Scan()
{
throw new Exception("Something");
await Task.Delay(
TimeSpan.FromSeconds(5));

View File

@ -1,3 +0,0 @@
FROM mindcollapse/malware-multi-scan-scanner:latest
ENV BackendType=Dummy

View File

@ -86,7 +86,6 @@ namespace MalwareMultiScan.Scanner.Services
await _bus.SendAsync(
_configuration.GetValue<string>("ResultsSubscriptionId"), result);
}
}
}

View File

@ -1,4 +1,6 @@
export default {
ssr: false,
head: {
title: 'MalwareMultiScan UI',
meta: [

View File

@ -12,8 +12,8 @@
<template #cell(threats)="data">
<div class="text-success" v-if="data.item.succeeded && !data.item.threats.length">No threats have been detected</div>
<div class="text-danger" v-if="data.item.succeeded === false">Scanning failed to complete due to the error or timeout</div>
<div v-if="!data.item.completed">Scanning is in progress</div>
<div class="text-danger" v-if="data.item.succeeded === false">Scan failed to complete due to the error or timeout</div>
<div v-if="!data.item.completed">Scan is in progress</div>
<ul v-if="data.item.completed && data.item.threats.length" class="list-inline m-0">
<li class="text-danger" v-for="threat in data.item.threats" v-bind:key="threat">{{ threat }}</li>

View File

@ -45,8 +45,8 @@ services:
- rabbitmq
- mongodb
environment:
- "ConnectionStrings__RabbitMQ=host=rabbitmq"
- "ConnectionStrings__Mongo=mongodb://mongodb:27017"
- "ConnectionStrings__RabbitMQ=host=rabbitmq;timeout=120"
- "ConnectionStrings__Mongo=mongodb://mongodb:27017?connectTimeoutMS=120000"
- "BackendsConfiguration=/etc/backends.yaml"
volumes:
- "./MalwareMultiScan.Api/backends.yaml:/etc/backends.yaml:ro"
@ -55,23 +55,23 @@ services:
dockerfile: MalwareMultiScan.Api/Dockerfile
dummy-scanner:
image: mindcollapse/malware-multi-scan-scanner-dummy
image: mindcollapse/malware-multi-scan-scanner
restart: on-failure
depends_on:
- rabbitmq
environment:
- "ConnectionStrings__RabbitMQ=host=rabbitmq;prefetchcount=1"
- "ConnectionStrings__RabbitMQ=host=rabbitmq;prefetchcount=1;timeout=120"
build:
context: MalwareMultiScan.Backends/Dockerfiles
dockerfile: Dummy.Dockerfile
context: .
dockerfile: MalwareMultiScan.Scanner/Dockerfile
clamav-scanner:
image: mindcollapse/malware-multi-scan-scanner-clamav
restart: on-failure
depends_on:
- rabbitmq
- dummy-scanner
environment:
- "ConnectionStrings__RabbitMQ=host=rabbitmq;prefetchcount=1"
- "ConnectionStrings__RabbitMQ=host=rabbitmq;prefetchcount=1;timeout=120"
build:
context: MalwareMultiScan.Backends/Dockerfiles
dockerfile: Clamav.Dockerfile
@ -80,9 +80,9 @@ services:
image: mindcollapse/malware-multi-scan-scanner-windows-defender
restart: on-failure
depends_on:
- rabbitmq
- dummy-scanner
environment:
- "ConnectionStrings__RabbitMQ=host=rabbitmq;prefetchcount=1"
- "ConnectionStrings__RabbitMQ=host=rabbitmq;prefetchcount=1;timeout=120"
build:
context: MalwareMultiScan.Backends/Dockerfiles
dockerfile: WindowsDefender.Dockerfile