diff --git a/OpenAlprWebhookProcessor.Server/Dockerfile b/OpenAlprWebhookProcessor.Server/Dockerfile index 89907e2..cfe0c4c 100644 --- a/OpenAlprWebhookProcessor.Server/Dockerfile +++ b/OpenAlprWebhookProcessor.Server/Dockerfile @@ -16,10 +16,9 @@ RUN apt-get update && apt-get install -y ca-certificates curl gnupg \ && echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_$NODE_MAJOR.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list \ && apt-get update && apt-get install nodejs -y -COPY ["openalprwebhookprocessor.client/nuget.config", "openalprwebhookprocessor.client/"] + COPY ["OpenAlprWebhookProcessor.Server/OpenAlprWebhookProcessor.Server.csproj", "OpenAlprWebhookProcessor.Server/"] -COPY ["openalprwebhookprocessor.client/openalprwebhookprocessor.client.esproj", "openalprwebhookprocessor.client/"] -RUN dotnet restore "./OpenAlprWebhookProcessor.Server/./OpenAlprWebhookProcessor.Server.csproj" +RUN dotnet restore "./OpenAlprWebhookProcessor.Server/OpenAlprWebhookProcessor.Server.csproj" COPY . . WORKDIR "/src/OpenAlprWebhookProcessor.Server" RUN dotnet build "./OpenAlprWebhookProcessor.Server.csproj" -c $BUILD_CONFIGURATION -o /app/build diff --git a/OpenAlprWebhookProcessor.Server/Startup.cs b/OpenAlprWebhookProcessor.Server/Startup.cs index 6c8f526..36bf494 100644 --- a/OpenAlprWebhookProcessor.Server/Startup.cs +++ b/OpenAlprWebhookProcessor.Server/Startup.cs @@ -232,7 +232,6 @@ public void ConfigureServices(IServiceCollection services) services.AddSingleton(mapper.CreateMapper()); services.AddHangfire(configuration => configuration - .SetDataCompatibilityLevel(CompatibilityLevel.Version_170) .UseSimpleAssemblyNameTypeSerializer() .UseRecommendedSerializerSettings() .UseInMemoryStorage()); diff --git a/openalprwebhookprocessor.client/angular.json b/openalprwebhookprocessor.client/angular.json index 378f5e8..32e012a 100644 --- a/openalprwebhookprocessor.client/angular.json +++ b/openalprwebhookprocessor.client/angular.json @@ -11,20 +11,20 @@ "prefix": "app", "architect": { "build": { - "builder": "@angular-devkit/build-angular:application", + "builder": "@angular-devkit/build-angular:browser-esbuild", "options": { - "outputPath": { - "base": "dist/openalprwebhookprocessor.client" - }, + "outputPath": "dist/openalprwebhookprocessor.client", "index": "src/index.html", + "main": "src/main.ts", "polyfills": [ "zone.js" ], "tsConfig": "tsconfig.app.json", "assets": [ - "src/assets/favicon.ico", - "src/assets", - "src/manifest.webmanifest" + { + "glob": "**/*", + "input": "public" + } ], "styles": [ "./node_modules/@angular/material/prebuilt-themes/indigo-pink.css", @@ -53,8 +53,7 @@ } ], "scripts": [], - "serviceWorker": "ngsw-config.json", - "browser": "src/main.ts" + "serviceWorker": true }, "configurations": { "production": {