From 02c4f972cdef61817c7290a60a786b565cc8754f Mon Sep 17 00:00:00 2001
From: Kristoffer T <kristoffer.tunlid@gmail.com>
Date: Thu, 16 Jan 2025 00:11:39 +0100
Subject: [PATCH] CI Updates

---
 .dockerignore                       | 23 ++++++++++++++---------
 .github/workflows/dockerpublish.yml |  2 +-
 Dockerfile                          | 24 ------------------------
 Hanekawa.Bot/Dockerfile             | 26 ++++++++++++++------------
 Hanekawa.Bot/Hanekawa.Bot.csproj    |  2 +-
 5 files changed, 30 insertions(+), 47 deletions(-)
 delete mode 100644 Dockerfile

diff --git a/.dockerignore b/.dockerignore
index e7f155a0..ca4e8683 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,21 +1,26 @@
-**/.dockerignore
+**/.dockerignore
 **/.env
 **/.git
 **/.gitignore
+**/.project
+**/.settings
+**/.toolstarget
 **/.vs
 **/.vscode
+**/.idea
 **/*.*proj.user
+**/*.dbmdl
+**/*.jfm
 **/azds.yaml
-**/charts
 **/bin
+**/charts
+**/docker-compose*
+**/Dockerfile*
+**/node_modules
+**/npm-debug.log
 **/obj
-**/Dockerfile
-**/Dockerfile.develop
-**/docker-compose.yml
-**/docker-compose.*.yml
-**/*.dbmdl
-**/*.jfm
 **/secrets.dev.yaml
 **/values.dev.yaml
-**/.toolstarget
+LICENSE
+README.md
 /Hanekawa/Properties/launchSettings.json
\ No newline at end of file
diff --git a/.github/workflows/dockerpublish.yml b/.github/workflows/dockerpublish.yml
index 868df054..4a941ff1 100644
--- a/.github/workflows/dockerpublish.yml
+++ b/.github/workflows/dockerpublish.yml
@@ -46,7 +46,7 @@ jobs:
       - uses: actions/checkout@v2
 
       - name: Build image
-        run: docker build . --file Hanekawa/Dockerfile --tag image
+        run: docker build . --file Hanekawa/Hanekawa.Bot/Dockerfile --tag image
 
       - name: Log into registry
         run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login docker.pkg.github.com -u ${{ github.actor }} --password-stdin
diff --git a/Dockerfile b/Dockerfile
deleted file mode 100644
index 2311e387..00000000
--- a/Dockerfile
+++ /dev/null
@@ -1,24 +0,0 @@
-FROM mcr.microsoft.com/dotnet/aspnet:5.0-buster-slim AS base
-WORKDIR /app
-EXPOSE 61038
-
-ENV token, connectionString, redis
-
-FROM mcr.microsoft.com/dotnet/sdk:5.0-buster-slim AS build
-WORKDIR /src
-COPY ["nuget.config", ""]
-COPY ["Hanekawa/Hanekawa.csproj", "Hanekawa/"]
-COPY ["Hanekawa.Database/Hanekawa.Database.csproj", "Hanekawa.Database/"]
-COPY ["Hanekawa.HungerGames/Hanekawa.HungerGames.csproj", "Hanekawa.HungerGames/"]
-RUN dotnet restore "Hanekawa/Hanekawa.csproj"
-COPY . .
-WORKDIR "/src/Hanekawa"
-RUN dotnet build "Hanekawa.csproj" -c Release -o /app/build
-
-FROM build AS publish
-RUN dotnet publish "Hanekawa.csproj" -c Release -o /app/publish
-
-FROM base AS final
-WORKDIR /app
-COPY --from=publish /app/publish .
-ENTRYPOINT ["dotnet", "Hanekawa.dll"]
\ No newline at end of file
diff --git a/Hanekawa.Bot/Dockerfile b/Hanekawa.Bot/Dockerfile
index 8ff2cf7d..45a2c6e0 100644
--- a/Hanekawa.Bot/Dockerfile
+++ b/Hanekawa.Bot/Dockerfile
@@ -1,25 +1,27 @@
-FROM mcr.microsoft.com/dotnet/aspnet:7.0 AS base
+FROM mcr.microsoft.com/dotnet/aspnet:9.0 AS base
+USER $APP_UID
 WORKDIR /app
-EXPOSE 80
-EXPOSE 443
+EXPOSE 8080
+EXPOSE 8081
 
-ENV botToken, applicationId, connectionString
-
-FROM mcr.microsoft.com/dotnet/sdk:7.0 AS build
+FROM mcr.microsoft.com/dotnet/sdk:9.0 AS build
+ARG BUILD_CONFIGURATION=Release
 WORKDIR /src
-COPY ["Hanekawa.Bot/Hanekawa.csproj", "Hanekawa/"]
-COPY ["Hanekawa.Bot/Hanekawa.Application.csproj", "Hanekawa.Application/"]
-COPY ["Hanekawa.Bot/Hanekawa.Infrastructure.csproj", "Hanekawa.Infrastructure/"]
+COPY ["nuget.config", ""]
 COPY ["Hanekawa.Bot/Hanekawa.Bot.csproj", "Hanekawa.Bot/"]
+COPY ["Hanekawa.Infrastructure/Hanekawa.Infrastructure.csproj", "Hanekawa.Infrastructure/"]
+COPY ["Hanekawa.Application/Hanekawa.Application.csproj", "Hanekawa.Application/"]
+COPY ["Hanekawa/Hanekawa.csproj", "Hanekawa/"]
 RUN dotnet restore "Hanekawa.Bot/Hanekawa.Bot.csproj"
 COPY . .
 WORKDIR "/src/Hanekawa.Bot"
-RUN dotnet build "Hanekawa.Bot.csproj" -c Release -o /app/build
+RUN dotnet build "Hanekawa.Bot.csproj" -c $BUILD_CONFIGURATION -o /app/build
 
 FROM build AS publish
-RUN dotnet publish "Hanekawa.Bot.csproj" -c Release -o /app/publish
+ARG BUILD_CONFIGURATION=Release
+RUN dotnet publish "Hanekawa.Bot.csproj" -c $BUILD_CONFIGURATION -o /app/publish /p:UseAppHost=false
 
 FROM base AS final
 WORKDIR /app
 COPY --from=publish /app/publish .
-ENTRYPOINT ["dotnet", "Hanekawa.Bot.dll"]
+ENTRYPOINT ["dotnet", "Hanekawa.Bot.dll"]
\ No newline at end of file
diff --git a/Hanekawa.Bot/Hanekawa.Bot.csproj b/Hanekawa.Bot/Hanekawa.Bot.csproj
index 92a3ad20..771c1d5c 100644
--- a/Hanekawa.Bot/Hanekawa.Bot.csproj
+++ b/Hanekawa.Bot/Hanekawa.Bot.csproj
@@ -28,10 +28,10 @@
     </ItemGroup>
 
     <ItemGroup>
+      <None Remove="Data\Template\ProfileTemplate.png" />
       <Content Include="..\.dockerignore">
         <Link>.dockerignore</Link>
       </Content>
-      <None Remove="Data\Template\ProfileTemplate.png" />
       <Content Include="Data\Template\ProfileTemplate.png">
         <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       </Content>