diff --git a/Birdmap.API/Dockerfile b/Birdmap.API/Dockerfile index b40d371..bdf8608 100644 --- a/Birdmap.API/Dockerfile +++ b/Birdmap.API/Dockerfile @@ -1,12 +1,12 @@ -FROM mcr.microsoft.com/dotnet/aspnet:5.0-buster-slim AS base +FROM mcr.microsoft.com/dotnet/aspnet:5.0 AS base WORKDIR /app RUN apt-get update && apt-get install -y curl -RUN curl -sL https://deb.nodesource.com/setup_lts.x | bash - +RUN curl -sL https://deb.nodesource.com/setup_12.x | bash - RUN apt-get update && apt-get install -y nodejs -FROM mcr.microsoft.com/dotnet/sdk:5.0-buster-slim AS build +FROM mcr.microsoft.com/dotnet/sdk:5.0 AS build RUN apt-get update && apt-get install -y curl -RUN curl -sL https://deb.nodesource.com/setup_lts.x | bash - +RUN curl -sL https://deb.nodesource.com/setup_12.x | bash - RUN apt-get update && apt-get install -y nodejs WORKDIR /src COPY ["Birdmap.API/Birdmap.API.csproj", "Birdmap.API/"] diff --git a/Birdmap.API/appsettings.json b/Birdmap.API/appsettings.json index da4be80..5312c57 100644 --- a/Birdmap.API/appsettings.json +++ b/Birdmap.API/appsettings.json @@ -6,11 +6,19 @@ "Microsoft.Hosting.Lifetime": "Information" } }, + "Kestrel": { + "Certificates": { + "Default": { + "Password": "certpass123", + "Path": "C:\\Users\\Ricsi\\AppData\\Roaming\\ASP.NET\\Https\\aspnetapp.pfx" + } + } + }, "AllowedHosts": "*", "Secret": "7vj.3KW.hYE!}4u6", // "LocalDbConnectionString": "Data Source=DESKTOP-3600\\SQLEXPRESS;Initial Catalog=birdmap;Integrated Security=True;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False", - //"LocalDbConnectionString": "Data Source=DESKTOP-3600;Initial Catalog=birdmap;Integrated Security=True;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False", - "LocalDbConnectionString": "Data Source=db;Initial Catalog=birdmap;User=sa;Password=RPSsql12345", + "LocalDbConnectionString": "Data Source=DESKTOP-3600;Initial Catalog=birdmap2;Integrated Security=True;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False", + //"LocalDbConnectionString": "Data Source=db;Initial Catalog=birdmap;User=sa;Password=RPSsql12345", "Defaults": { "Services": { "Local Database": "https://localhost:44331/health", diff --git a/MQTTnet.TestApp.WinForm/Retained.json b/MQTTnet.TestApp.WinForm/Retained.json new file mode 100644 index 0000000..25cf512 --- /dev/null +++ b/MQTTnet.TestApp.WinForm/Retained.json @@ -0,0 +1 @@ +[{"Topic":"devices/output","Payload":"eyJ0YWciOiIxN2NmOGI4Mi1lZDQ4LTQ4MDctOTI3MS0xZDlmMGY5ZDViMWYiLCJwcm9iYWJpbGl0eSI6MC43MjA0MzAyMzAxMjU5ODUyfQ==","QualityOfServiceLevel":1,"Retain":true,"UserProperties":null,"ContentType":null,"ResponseTopic":null,"PayloadFormatIndicator":null,"MessageExpiryInterval":null,"TopicAlias":null,"CorrelationData":null,"SubscriptionIdentifiers":null}] \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index ccef4ac..0856baf 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -21,11 +21,11 @@ services: depends_on: - db environment: - - ASPNETCORE_ENVIRONMENT=Development + - ASPNETCORE_ENVIRONMENT=Docker - ASPNETCORE_URLS=https://+;http://+ - ASPNETCORE_HTTPS_PORT=8001 - - ASPNETCORE_Kestrel__Certificates__Default__Password=certpass123 - - ASPNETCORE_Kestrel__Certificates__Default__Path=/root/.aspnet/https/aspnetapp.pfx + - Birdmap_Kestrel__Certificates__Default__Password=certpass123 + - Birdmap_Kestrel__Certificates__Default__Path=/root/.aspnet/https/aspnetapp.pfx - Birdmap_LocalDbConnectionString=Data Source=db;Initial Catalog=birdmap;User=sa;Password=RPSsql12345 - Birdmap_Defaults__Users__0__Name=admin - Birdmap_Defaults__Users__0__Password=pass