Fix container not compiling

Xwilarg · Dec 3, 2024 · 9240936 · 9240936
1 parent e93936e
commit 9240936
Show file tree

Hide file tree

Showing 57 changed files with 471 additions and 17 deletions.
diff --git a/api/.dockerignore → backend/.dockerignore b/api/.dockerignore → backend/.dockerignore
diff --git a/api/.gitignore → backend/.gitignore b/api/.gitignore → backend/.gitignore
diff --git a/api/Euphonia.API.sln → backend/Euphonia.sln b/api/Euphonia.API.sln → backend/Euphonia.sln
@@ -3,29 +3,29 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.12.35209.166
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Euphonia.API", "Euphonia.API.csproj", "{04F2673A-59DE-4B3D-8B34-DD338CC1CF65}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Euphonia.API", "api\Euphonia.API.csproj", "{F003D3D5-93A5-4EB2-AFEB-78421CF68FD0}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Euphonia.Common", "..\common\Euphonia.Common.csproj", "{75ACA57E-4F62-497C-AFF6-149B0E9B0E20}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Euphonia.Common", "common\Euphonia.Common.csproj", "{953FC742-C592-4DF0-B9A0-3EA9E4B904D1}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{04F2673A-59DE-4B3D-8B34-DD338CC1CF65}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{04F2673A-59DE-4B3D-8B34-DD338CC1CF65}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{04F2673A-59DE-4B3D-8B34-DD338CC1CF65}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{04F2673A-59DE-4B3D-8B34-DD338CC1CF65}.Release|Any CPU.Build.0 = Release|Any CPU
-		{75ACA57E-4F62-497C-AFF6-149B0E9B0E20}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{75ACA57E-4F62-497C-AFF6-149B0E9B0E20}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{75ACA57E-4F62-497C-AFF6-149B0E9B0E20}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{75ACA57E-4F62-497C-AFF6-149B0E9B0E20}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F003D3D5-93A5-4EB2-AFEB-78421CF68FD0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F003D3D5-93A5-4EB2-AFEB-78421CF68FD0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F003D3D5-93A5-4EB2-AFEB-78421CF68FD0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F003D3D5-93A5-4EB2-AFEB-78421CF68FD0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{953FC742-C592-4DF0-B9A0-3EA9E4B904D1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{953FC742-C592-4DF0-B9A0-3EA9E4B904D1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{953FC742-C592-4DF0-B9A0-3EA9E4B904D1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{953FC742-C592-4DF0-B9A0-3EA9E4B904D1}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {8649F153-1179-465D-89EB-ED4D083B2844}
+		SolutionGuid = {B28EB5AC-1B86-4716-AEFD-4C92129ACE9D}
 	EndGlobalSection
 EndGlobal
diff --git a/common/.gitignore → backend/api/.gitignore b/common/.gitignore → backend/api/.gitignore
diff --git a/api/Controllers/AuthController.cs → backend/api/Controllers/AuthController.cs b/api/Controllers/AuthController.cs → backend/api/Controllers/AuthController.cs
diff --git a/api/Controllers/DataController.cs → backend/api/Controllers/DataController.cs b/api/Controllers/DataController.cs → backend/api/Controllers/DataController.cs
diff --git a/api/Controllers/PlaylistController.cs → ...end/api/Controllers/PlaylistController.cs b/api/Controllers/PlaylistController.cs → ...end/api/Controllers/PlaylistController.cs
diff --git a/api/Controllers/RootController.cs → backend/api/Controllers/RootController.cs b/api/Controllers/RootController.cs → backend/api/Controllers/RootController.cs
diff --git a/api/Controllers/Utils.cs → backend/api/Controllers/Utils.cs b/api/Controllers/Utils.cs → backend/api/Controllers/Utils.cs
diff --git a/api/Dockerfile → backend/api/Dockerfile b/api/Dockerfile → backend/api/Dockerfile
@@ -12,14 +12,15 @@ EXPOSE 8081
 FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build
 ARG BUILD_CONFIGURATION=Release
 WORKDIR /src
-COPY ["Euphonia.API.csproj", "."]
-RUN dotnet restore "./Euphonia.API.csproj"
+COPY ["api/Euphonia.API.csproj", "api/"]
+COPY ["common/Euphonia.Common.csproj", "common/"]
+RUN dotnet restore "./api/Euphonia.API.csproj"
 COPY . .
-WORKDIR "/src/."
+WORKDIR "/src/api"
 RUN dotnet build "./Euphonia.API.csproj" -c $BUILD_CONFIGURATION -o /app/build
 RUN apt-get update
-RUN apt-get install -t ./app -y python3 python3-pip
-RUN pip3 install --break-system-packages ffmpeg-python yt-dlp ffmpeg-normalize
+RUN apt-get install -y python3 python3-pip ffmpeg yt-dlp
+RUN pip3 install --break-system-packages ffmpeg-normalize
 
 # This stage is used to publish the service project to be copied to the final stage
 FROM build AS publish

diff --git a/api/Euphonia.API.csproj → backend/api/Euphonia.API.csproj b/api/Euphonia.API.csproj → backend/api/Euphonia.API.csproj
@@ -6,7 +6,6 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <UserSecretsId>15d1d09d-4de0-45a5-b140-535520c48b1a</UserSecretsId>
     <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
-    <DockerfileContext>.</DockerfileContext>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/api/Euphonia.API.http → backend/api/Euphonia.API.http b/api/Euphonia.API.http → backend/api/Euphonia.API.http
diff --git a/api/Models/Credentials.cs → backend/api/Models/Credentials.cs b/api/Models/Credentials.cs → backend/api/Models/Credentials.cs
diff --git a/api/Models/PlaylistForm.cs → backend/api/Models/PlaylistForm.cs b/api/Models/PlaylistForm.cs → backend/api/Models/PlaylistForm.cs
diff --git a/api/Models/Response.cs → backend/api/Models/Response.cs b/api/Models/Response.cs → backend/api/Models/Response.cs
diff --git a/api/Models/SongForm.cs → backend/api/Models/SongForm.cs b/api/Models/SongForm.cs → backend/api/Models/SongForm.cs
diff --git a/api/Models/SongIdentifier.cs → backend/api/Models/SongIdentifier.cs b/api/Models/SongIdentifier.cs → backend/api/Models/SongIdentifier.cs
diff --git a/api/Models/TokenResponse.cs → backend/api/Models/TokenResponse.cs b/api/Models/TokenResponse.cs → backend/api/Models/TokenResponse.cs
diff --git a/api/Models/YoutubeForm.cs → backend/api/Models/YoutubeForm.cs b/api/Models/YoutubeForm.cs → backend/api/Models/YoutubeForm.cs
diff --git a/api/Program.cs → backend/api/Program.cs b/api/Program.cs → backend/api/Program.cs
diff --git a/api/Properties/launchSettings.json → backend/api/Properties/launchSettings.json b/api/Properties/launchSettings.json → backend/api/Properties/launchSettings.json
diff --git a/api/Services/WebsiteManager.cs → backend/api/Services/WebsiteManager.cs b/api/Services/WebsiteManager.cs → backend/api/Services/WebsiteManager.cs
diff --git a/api/appsettings.Development.json → backend/api/appsettings.Development.json b/api/appsettings.Development.json → backend/api/appsettings.Development.json
diff --git a/api/appsettings.json → backend/api/appsettings.json b/api/appsettings.json → backend/api/appsettings.json
diff --git a/downloader/.gitignore → backend/common/.gitignore b/downloader/.gitignore → backend/common/.gitignore
diff --git a/common/Euphonia.Common.csproj → backend/common/Euphonia.Common.csproj b/common/Euphonia.Common.csproj → backend/common/Euphonia.Common.csproj
diff --git a/common/Euphonia.Common.sln → backend/common/Euphonia.Common.sln b/common/Euphonia.Common.sln → backend/common/Euphonia.Common.sln
diff --git a/common/EuphoniaInfo.cs → backend/common/EuphoniaInfo.cs b/common/EuphoniaInfo.cs → backend/common/EuphoniaInfo.cs