Skip to content

Commit

Permalink
feat: .NET 6 & Dockerfile
Browse files Browse the repository at this point in the history
BREAKING CHANGE
  • Loading branch information
brunobritodev committed Apr 3, 2022
1 parent 430151e commit 2bb76e3
Show file tree
Hide file tree
Showing 28 changed files with 146 additions and 95 deletions.
Binary file not shown.
19 changes: 9 additions & 10 deletions src/api-gateways/DevStore.Bff.Checkout/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,20 +1,19 @@
#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/aspnet:5.0 AS base
FROM mcr.microsoft.com/dotnet/aspnet:6.0 AS base
WORKDIR /app
EXPOSE 80
EXPOSE 443

FROM mcr.microsoft.com/dotnet/sdk:5.0 AS build
FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build
WORKDIR /src
COPY ["./api-gateways/DevStore.Bff.Checkout/DevStore.Bff.Checkout.csproj", "api-gateways/DevStore.Bff.Checkout/"]
COPY ["./building-blocks/DevStore.Core/DevStore.Core.csproj", "building blocks/DevStore.WebAPI.Core/"]
COPY ["./building-blocks/DevStore.WebAPI.Core/DevStore.WebAPI.Core.csproj", "building blocks/DevStore.WebAPI.Core/"]
COPY ["./building-blocks/DevStore.MessageBus/DevStore.MessageBus.csproj", "building blocks/DevStore.MessageBus/"]

RUN dotnet restore "api-gateways/DevStore.Bff.Checkout/DevStore.Bff.Checkout.csproj"
COPY ["src/api-gateways/DevStore.Bff.Checkout/DevStore.Bff.Checkout.csproj", "src/api-gateways/DevStore.Bff.Checkout/"]
COPY ["src/building-blocks/DevStore.WebAPI.Core/DevStore.WebAPI.Core.csproj", "src/building-blocks/DevStore.WebAPI.Core/"]
COPY ["src/building-blocks/DevStore.Core/DevStore.Core.csproj", "src/building-blocks/DevStore.Core/"]
COPY ["src/building-blocks/DevStore.MessageBus/DevStore.MessageBus.csproj", "src/building-blocks/DevStore.MessageBus/"]
RUN dotnet restore "src/api-gateways/DevStore.Bff.Checkout/DevStore.Bff.Checkout.csproj"
COPY . .
WORKDIR "api-gateways/DevStore.Bff.Checkout"
WORKDIR "/src/src/api-gateways/DevStore.Bff.Checkout"
RUN dotnet build "DevStore.Bff.Checkout.csproj" -c Release -o /app/build

FROM build AS publish
Expand All @@ -23,4 +22,4 @@ RUN dotnet publish "DevStore.Bff.Checkout.csproj" -c Release -o /app/publish
FROM base AS final
WORKDIR /app
COPY --from=publish /app/publish .
ENTRYPOINT ["dotnet", "DevStore.Bff.Checkout.dll"]
ENTRYPOINT ["dotnet", "DevStore.Bff.Checkout.dll"]
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
"$schema": "http://json.schemastore.org/launchsettings.json",
"iisSettings": {
"windowsAuthentication": false,
"anonymousAuthentication": true,
Expand All @@ -7,7 +8,6 @@
"sslPort": 44356
}
},
"$schema": "http://json.schemastore.org/launchsettings.json",
"profiles": {
"SelfHosting - Dev": {
"commandName": "Project",
Expand All @@ -17,6 +17,13 @@
"ASPNETCORE_ENVIRONMENT": "Development"
},
"applicationUrl": "https://localhost:5451;http://localhost:5450"
},
"Docker (1)": {
"commandName": "Docker",
"launchBrowser": true,
"launchUrl": "{Scheme}://{ServiceHost}:{ServicePort}/swagger",
"publishAllPorts": true,
"useSSL": true
}
}
}
12 changes: 6 additions & 6 deletions src/building-blocks/DevStore.Core/DevStore.Core.csproj
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net5.0</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="FluentValidation" Version="10.3.3" />
<PackageReference Include="mediatr" Version="9.0.0" />
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="5.0.0" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="5.0.0" />
<PackageReference Include="NetDevPack" Version="5.3.0" />
<PackageReference Include="FluentValidation" Version="10.4.0" />
<PackageReference Include="mediatr" Version="10.0.1" />
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="6.0.0" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="6.0.0" />
<PackageReference Include="NetDevPack" Version="6.0.1" />
</ItemGroup>

</Project>
Binary file not shown.
Binary file not shown.
Binary file modified src/services/DevStore.Billing.API/DevStore.Billing.API.csproj
Binary file not shown.
20 changes: 10 additions & 10 deletions src/services/DevStore.Billing.API/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
#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/aspnet:5.0 AS base
FROM mcr.microsoft.com/dotnet/aspnet:6.0 AS base
WORKDIR /app
EXPOSE 80
EXPOSE 443

FROM mcr.microsoft.com/dotnet/sdk:5.0 AS build
FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build
WORKDIR /src
COPY ["./services/DevStore.Billing.API/DevStore.Billing.API.csproj", "services/DevStore.Billing.API/"]
COPY ["./building-blocks/DevStore.Core/DevStore.Core.csproj", "building blocks/DevStore.WebAPI.Core/"]
COPY ["./building-blocks/DevStore.WebAPI.Core/DevStore.WebAPI.Core.csproj", "building blocks/DevStore.WebAPI.Core/"]
COPY ["./building-blocks/DevStore.MessageBus/DevStore.MessageBus.csproj", "building blocks/DevStore.MessageBus/"]

RUN dotnet restore "services/DevStore.Billing.API/DevStore.Billing.API.csproj"
COPY ["src/services/DevStore.Billing.API/DevStore.Billing.API.csproj", "src/services/DevStore.Billing.API/"]
COPY ["src/services/DevStore.Billing.DevsPay/DevStore.Billing.DevsPay.csproj", "src/services/DevStore.Billing.DevsPay/"]
COPY ["src/building-blocks/DevStore.WebAPI.Core/DevStore.WebAPI.Core.csproj", "src/building-blocks/DevStore.WebAPI.Core/"]
COPY ["src/building-blocks/DevStore.Core/DevStore.Core.csproj", "src/building-blocks/DevStore.Core/"]
COPY ["src/building-blocks/DevStore.MessageBus/DevStore.MessageBus.csproj", "src/building-blocks/DevStore.MessageBus/"]
RUN dotnet restore "src/services/DevStore.Billing.API/DevStore.Billing.API.csproj"
COPY . .
WORKDIR "services/DevStore.Billing.API"
WORKDIR "/src/src/services/DevStore.Billing.API"
RUN dotnet build "DevStore.Billing.API.csproj" -c Release -o /app/build

FROM build AS publish
Expand All @@ -23,4 +23,4 @@ RUN dotnet publish "DevStore.Billing.API.csproj" -c Release -o /app/publish
FROM base AS final
WORKDIR /app
COPY --from=publish /app/publish .
ENTRYPOINT ["dotnet", "DevStore.Billing.API.dll"]
ENTRYPOINT ["dotnet", "DevStore.Billing.API.dll"]
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
"$schema": "http://json.schemastore.org/launchsettings.json",
"iisSettings": {
"windowsAuthentication": false,
"anonymousAuthentication": true,
Expand All @@ -7,7 +8,6 @@
"sslPort": 44314
}
},
"$schema": "http://json.schemastore.org/launchsettings.json",
"profiles": {
"SelfHosting - Dev": {
"commandName": "Project",
Expand All @@ -17,6 +17,13 @@
"ASPNETCORE_ENVIRONMENT": "Development"
},
"applicationUrl": "https://localhost:5461;http://localhost:5460"
},
"Docker (1)": {
"commandName": "Docker",
"launchBrowser": true,
"launchUrl": "{Scheme}://{ServiceHost}:{ServicePort}/swagger",
"publishAllPorts": true,
"useSSL": true
}
}
}
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net5.0</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Bogus" Version="33.1.1" />
<PackageReference Include="NetDevPack" Version="5.3.0" />
<PackageReference Include="Bogus" Version="34.0.2" />
<PackageReference Include="NetDevPack" Version="6.0.1" />
</ItemGroup>

</Project>
Binary file modified src/services/DevStore.Catalog.API/DevStore.Catalog.API.csproj
Binary file not shown.
19 changes: 9 additions & 10 deletions src/services/DevStore.Catalog.API/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,20 +1,19 @@
#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/aspnet:5.0 AS base
FROM mcr.microsoft.com/dotnet/aspnet:6.0 AS base
WORKDIR /app
EXPOSE 80
EXPOSE 443

FROM mcr.microsoft.com/dotnet/sdk:5.0 AS build
FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build
WORKDIR /src
COPY ["./services/DevStore.Catalog.API/DevStore.Catalog.API.csproj", "services/DevStore.Catalog.API/"]
COPY ["./building-blocks/DevStore.Core/DevStore.Core.csproj", "building blocks/DevStore.WebAPI.Core/"]
COPY ["./building-blocks/DevStore.WebAPI.Core/DevStore.WebAPI.Core.csproj", "building blocks/DevStore.WebAPI.Core/"]
COPY ["./building-blocks/DevStore.MessageBus/DevStore.MessageBus.csproj", "building blocks/DevStore.MessageBus/"]

RUN dotnet restore "services/DevStore.Catalog.API/DevStore.Catalog.API.csproj"
COPY ["src/services/DevStore.Catalog.API/DevStore.Catalog.API.csproj", "src/services/DevStore.Catalog.API/"]
COPY ["src/building-blocks/DevStore.WebAPI.Core/DevStore.WebAPI.Core.csproj", "src/building-blocks/DevStore.WebAPI.Core/"]
COPY ["src/building-blocks/DevStore.Core/DevStore.Core.csproj", "src/building-blocks/DevStore.Core/"]
COPY ["src/building-blocks/DevStore.MessageBus/DevStore.MessageBus.csproj", "src/building-blocks/DevStore.MessageBus/"]
RUN dotnet restore "src/services/DevStore.Catalog.API/DevStore.Catalog.API.csproj"
COPY . .
WORKDIR "services/DevStore.Catalog.API"
WORKDIR "/src/src/services/DevStore.Catalog.API"
RUN dotnet build "DevStore.Catalog.API.csproj" -c Release -o /app/build

FROM build AS publish
Expand All @@ -23,4 +22,4 @@ RUN dotnet publish "DevStore.Catalog.API.csproj" -c Release -o /app/publish
FROM base AS final
WORKDIR /app
COPY --from=publish /app/publish .
ENTRYPOINT ["dotnet", "DevStore.Catalog.API.dll"]
ENTRYPOINT ["dotnet", "DevStore.Catalog.API.dll"]
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
"$schema": "http://json.schemastore.org/launchsettings.json",
"iisSettings": {
"windowsAuthentication": false,
"anonymousAuthentication": true,
Expand All @@ -7,7 +8,6 @@
"sslPort": 44307
}
},
"$schema": "http://json.schemastore.org/launchsettings.json",
"profiles": {
"SelfHosting": {
"commandName": "Project",
Expand All @@ -17,6 +17,13 @@
"ASPNETCORE_ENVIRONMENT": "Development"
},
"applicationUrl": "https://localhost:5431;http://localhost:5430"
},
"Docker (1)": {
"commandName": "Docker",
"launchBrowser": true,
"launchUrl": "{Scheme}://{ServiceHost}:{ServicePort}/swagger",
"publishAllPorts": true,
"useSSL": true
}
}
}
Binary file not shown.
19 changes: 9 additions & 10 deletions src/services/DevStore.Customers.API/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,20 +1,19 @@
#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/aspnet:5.0 AS base
FROM mcr.microsoft.com/dotnet/aspnet:6.0 AS base
WORKDIR /app
EXPOSE 80
EXPOSE 443

FROM mcr.microsoft.com/dotnet/sdk:5.0 AS build
FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build
WORKDIR /src
COPY ["./services/DevStore.Customers.API/DevStore.Customers.API.csproj", "services/DevStore.Customers.API/"]
COPY ["./building-blocks/DevStore.Core/DevStore.Core.csproj", "building blocks/DevStore.WebAPI.Core/"]
COPY ["./building-blocks/DevStore.WebAPI.Core/DevStore.WebAPI.Core.csproj", "building blocks/DevStore.WebAPI.Core/"]
COPY ["./building-blocks/DevStore.MessageBus/DevStore.MessageBus.csproj", "building blocks/DevStore.MessageBus/"]

RUN dotnet restore "services/DevStore.Customers.API/DevStore.Customers.API.csproj"
COPY ["src/services/DevStore.Customers.API/DevStore.Customers.API.csproj", "src/services/DevStore.Customers.API/"]
COPY ["src/building-blocks/DevStore.WebAPI.Core/DevStore.WebAPI.Core.csproj", "src/building-blocks/DevStore.WebAPI.Core/"]
COPY ["src/building-blocks/DevStore.Core/DevStore.Core.csproj", "src/building-blocks/DevStore.Core/"]
COPY ["src/building-blocks/DevStore.MessageBus/DevStore.MessageBus.csproj", "src/building-blocks/DevStore.MessageBus/"]
RUN dotnet restore "src/services/DevStore.Customers.API/DevStore.Customers.API.csproj"
COPY . .
WORKDIR "services/DevStore.Customers.API"
WORKDIR "/src/src/services/DevStore.Customers.API"
RUN dotnet build "DevStore.Customers.API.csproj" -c Release -o /app/build

FROM build AS publish
Expand All @@ -23,4 +22,4 @@ RUN dotnet publish "DevStore.Customers.API.csproj" -c Release -o /app/publish
FROM base AS final
WORKDIR /app
COPY --from=publish /app/publish .
ENTRYPOINT ["dotnet", "DevStore.Customers.API.dll"]
ENTRYPOINT ["dotnet", "DevStore.Customers.API.dll"]
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
"$schema": "http://json.schemastore.org/launchsettings.json",
"iisSettings": {
"windowsAuthentication": false,
"anonymousAuthentication": true,
Expand All @@ -7,7 +8,6 @@
"sslPort": 44317
}
},
"$schema": "http://json.schemastore.org/launchsettings.json",
"profiles": {
"SelfHosting - Dev": {
"commandName": "Project",
Expand All @@ -17,6 +17,13 @@
"ASPNETCORE_ENVIRONMENT": "Development"
},
"applicationUrl": "https://localhost:5441;http://localhost:5440"
},
"Docker (1)": {
"commandName": "Docker",
"launchBrowser": true,
"launchUrl": "{Scheme}://{ServiceHost}:{ServicePort}/swagger",
"publishAllPorts": true,
"useSSL": true
}
}
}
19 changes: 9 additions & 10 deletions src/services/DevStore.Identity.API/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,20 +1,19 @@
#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/aspnet:5.0 AS base
FROM mcr.microsoft.com/dotnet/aspnet:6.0 AS base
WORKDIR /app
EXPOSE 80
EXPOSE 443

FROM mcr.microsoft.com/dotnet/sdk:5.0 AS build
FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build
WORKDIR /src
COPY ["./services/DevStore.Identity.API/DevStore.Identity.API.csproj", "services/DevStore.Identity.API/"]
COPY ["./building-blocks/DevStore.Core/DevStore.Core.csproj", "building blocks/DevStore.WebAPI.Core/"]
COPY ["./building-blocks/DevStore.WebAPI.Core/DevStore.WebAPI.Core.csproj", "building blocks/DevStore.WebAPI.Core/"]
COPY ["./building-blocks/DevStore.MessageBus/DevStore.MessageBus.csproj", "building blocks/DevStore.MessageBus/"]

RUN dotnet restore "services/DevStore.Identity.API/DevStore.Identity.API.csproj"
COPY ["src/services/DevStore.Identity.API/DevStore.Identity.API.csproj", "src/services/DevStore.Identity.API/"]
COPY ["src/building-blocks/DevStore.WebAPI.Core/DevStore.WebAPI.Core.csproj", "src/building-blocks/DevStore.WebAPI.Core/"]
COPY ["src/building-blocks/DevStore.Core/DevStore.Core.csproj", "src/building-blocks/DevStore.Core/"]
COPY ["src/building-blocks/DevStore.MessageBus/DevStore.MessageBus.csproj", "src/building-blocks/DevStore.MessageBus/"]
RUN dotnet restore "src/services/DevStore.Identity.API/DevStore.Identity.API.csproj"
COPY . .
WORKDIR "services/DevStore.Identity.API"
WORKDIR "/src/src/services/DevStore.Identity.API"
RUN dotnet build "DevStore.Identity.API.csproj" -c Release -o /app/build

FROM build AS publish
Expand All @@ -23,4 +22,4 @@ RUN dotnet publish "DevStore.Identity.API.csproj" -c Release -o /app/publish
FROM base AS final
WORKDIR /app
COPY --from=publish /app/publish .
ENTRYPOINT ["dotnet", "DevStore.Identity.API.dll"]
ENTRYPOINT ["dotnet", "DevStore.Identity.API.dll"]
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
"$schema": "http://json.schemastore.org/launchsettings.json",
"iisSettings": {
"windowsAuthentication": false,
"anonymousAuthentication": true,
Expand All @@ -7,7 +8,6 @@
"sslPort": 44396
}
},
"$schema": "http://json.schemastore.org/launchsettings.json",
"profiles": {
"SelfHosting - Dev": {
"commandName": "Project",
Expand All @@ -17,6 +17,13 @@
"ASPNETCORE_ENVIRONMENT": "Development"
},
"applicationUrl": "https://localhost:5421;http://localhost:5420"
},
"Docker (1)": {
"commandName": "Docker",
"launchBrowser": true,
"launchUrl": "{Scheme}://{ServiceHost}:{ServicePort}/swagger",
"publishAllPorts": true,
"useSSL": true
}
}
}
Binary file modified src/services/DevStore.Orders.API/DevStore.Orders.API.csproj
Binary file not shown.
Loading

0 comments on commit 2bb76e3

Please sign in to comment.