Skip to content

Commit d60dbdd

Browse files
committed
Updated to use latest Docker
1 parent c5c2247 commit d60dbdd

File tree

4 files changed

+18
-17
lines changed

4 files changed

+18
-17
lines changed

ConsoleChatbot/Program.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ private static FritzBot CreateFritzBot(IChatService chatService)
6464
var loggerFactory = svcProvider.GetService<ILoggerFactory>();
6565

6666
return new FritzBot(config, svcProvider, loggerFactory);
67-
67+
6868
}
6969

7070
}

Fritz.StreamTools/Dockerfile

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,26 @@
1+
#See https://aka.ms/containerfastmode to understand how Visual Studio uses this Dockerfile to build your images for faster debugging.
2+
13
FROM mcr.microsoft.com/dotnet/aspnet:6.0 AS base
24
WORKDIR /app
35
EXPOSE 80
6+
EXPOSE 443
47

58
FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build
69
WORKDIR /src
7-
COPY global.json .
8-
COPY Fritz.StreamTools/Fritz.StreamTools.csproj Fritz.StreamTools/
9-
COPY Fritz.StreamLib.Core/Fritz.StreamLib.Core.csproj Fritz.StreamLib.Core/
10-
COPY Fritz.Chatbot/Fritz.Chatbot.csproj Fritz.Chatbot/
11-
COPY Fritz.Twitch/Fritz.Twitch.csproj Fritz.Twitch/
12-
WORKDIR /src/Fritz.StreamTools
13-
RUN dotnet restore
14-
COPY Fritz.StreamTools/. .
15-
COPY Fritz.StreamLib.Core/. ../Fritz.StreamLib.Core
16-
COPY Fritz.Chatbot/. ../Fritz.Chatbot/.
17-
COPY Fritz.Twitch/. ../Fritz.Twitch/.
18-
RUN dotnet build -c Release -o /app --no-restore
10+
COPY ["Fritz.StreamTools/Fritz.StreamTools.csproj", "Fritz.StreamTools/"]
11+
COPY ["Fritz.Chatbot/Fritz.Chatbot.csproj", "Fritz.Chatbot/"]
12+
COPY ["Fritz.StreamLib.Core/Fritz.StreamLib.Core.csproj", "Fritz.StreamLib.Core/"]
13+
COPY ["Fritz.Twitch/Fritz.Twitch.csproj", "Fritz.Twitch/"]
14+
RUN dotnet restore "Fritz.StreamTools/Fritz.StreamTools.csproj"
15+
COPY . .
16+
WORKDIR "/src/Fritz.StreamTools"
17+
RUN dotnet build "Fritz.StreamTools.csproj" -c Release -o /app/build
1918

2019
FROM build AS publish
21-
RUN dotnet publish -c Release -o /app
20+
RUN dotnet publish "Fritz.StreamTools.csproj" -c Release -o /app/publish
2221

2322
FROM base AS final
2423
WORKDIR /app
25-
COPY --from=publish /app .
26-
COPY --from=publish /src/Fritz.StreamTools/wwwroot/. /src/Fritz.StreamTools/wwwroot
24+
COPY --from=publish /app/publish .
25+
ENV Logging__Console__FormatterName=Simple
2726
ENTRYPOINT ["dotnet", "Fritz.StreamTools.dll"]

Fritz.StreamTools/Fritz.StreamTools.csproj

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
<DockerComposeProjectPath>..\docker-compose.dcproj</DockerComposeProjectPath>
55
<UserSecretsId>78c713a0-80e0-4e16-956a-33cf16f08a02</UserSecretsId>
66
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
7+
<DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
78
</PropertyGroup>
89
<ItemGroup>
910
<Compile Remove="ClientApp\**" />
@@ -23,6 +24,7 @@
2324
<PackageReference Include="LazyCache.AspNetCore" Version="2.4.0" />
2425
<PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.MessagePack" Version="6.0.2" />
2526
<PackageReference Include="Microsoft.Azure.CognitiveServices.Language.TextAnalytics" Version="4.0.0" />
27+
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.14.0" />
2628
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="6.0.2" />
2729
<PackageReference Include="Octokit" Version="0.50.0" />
2830
<PackageReference Include="System.IO.Abstractions" Version="16.1.10" />

build.cmd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
docker build -t fritz.streamtools:%1 -t fritz.streamtools:latest -f Fritz.StreamTools\Dockerfile .
1+
docker build --no-cache -t fritz.streamtools:%1 -t fritz.streamtools:latest -f Fritz.StreamTools\Dockerfile .
22

33
docker tag fritz.streamtools:%1 fritzregistry.azurecr.io/fritz.streamtools:%1
44
docker tag fritz.streamtools:%1 fritzregistry.azurecr.io/fritz.streamtools:latest

0 commit comments

Comments
 (0)