From e39337f8f12e49ee9547abbbf30149a0ee149449 Mon Sep 17 00:00:00 2001
From: Zoe Roux <zoe.roux@zoriya.dev>
Date: Mon, 15 Apr 2024 21:24:19 +0200
Subject: [PATCH] Use env variable for migration bundle instead of dockerfile
 entrypoint

---
 back/Dockerfile.migrations                  | 2 +-
 back/src/Kyoo.Postgresql/PostgresContext.cs | 7 ++++++-
 back/src/Kyoo.Postgresql/PostgresModule.cs  | 5 ++---
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/back/Dockerfile.migrations b/back/Dockerfile.migrations
index 204ef850..55377552 100644
--- a/back/Dockerfile.migrations
+++ b/back/Dockerfile.migrations
@@ -24,4 +24,4 @@ RUN dotnet ef migrations bundle --no-build --self-contained -r linux-${TARGETARC
 FROM mcr.microsoft.com/dotnet/runtime-deps:8.0
 COPY --from=builder /app/migrate /app/migrate
 
-ENTRYPOINT /app/migrate --connection "USER ID=${POSTGRES_USER};PASSWORD=${POSTGRES_PASSWORD};SERVER=${POSTGRES_SERVER};PORT=${POSTGRES_PORT};DATABASE=${POSTGRES_DB};"
+ENTRYPOINT ["/app/migrate"]
diff --git a/back/src/Kyoo.Postgresql/PostgresContext.cs b/back/src/Kyoo.Postgresql/PostgresContext.cs
index 3b8570f4..54dfe6a1 100644
--- a/back/src/Kyoo.Postgresql/PostgresContext.cs
+++ b/back/src/Kyoo.Postgresql/PostgresContext.cs
@@ -40,6 +40,7 @@ public class PostgresContext(DbContextOptions options, IHttpContextAccessor acce
 {
 	protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
 	{
+		optionsBuilder.UseProjectables();
 		optionsBuilder.UseSnakeCaseNamingConvention();
 		base.OnConfiguring(optionsBuilder);
 	}
@@ -128,7 +129,11 @@ public class PostgresContextBuilder : IDesignTimeDbContextFactory<PostgresContex
 {
 	public PostgresContext CreateDbContext(string[] args)
 	{
-		NpgsqlDataSource dataSource = PostgresModule.CreateDataSource(new ConfigurationManager());
+		IConfigurationRoot config = new ConfigurationBuilder()
+			.AddEnvironmentVariables()
+			.AddCommandLine(args)
+			.Build();
+		NpgsqlDataSource dataSource = PostgresModule.CreateDataSource(config);
 		DbContextOptionsBuilder builder = new();
 		builder.UseNpgsql(dataSource);
 
diff --git a/back/src/Kyoo.Postgresql/PostgresModule.cs b/back/src/Kyoo.Postgresql/PostgresModule.cs
index 9b0f9f02..2720635f 100644
--- a/back/src/Kyoo.Postgresql/PostgresModule.cs
+++ b/back/src/Kyoo.Postgresql/PostgresModule.cs
@@ -37,7 +37,7 @@ public static class PostgresModule
 			{
 				["USER ID"] = configuration.GetValue("POSTGRES_USER", "KyooUser"),
 				["PASSWORD"] = configuration.GetValue("POSTGRES_PASSWORD", "KyooPassword"),
-				["SERVER"] = configuration.GetValue("POSTGRES_SERVER", "db"),
+				["SERVER"] = configuration.GetValue("POSTGRES_SERVER", "postgres"),
 				["PORT"] = configuration.GetValue("POSTGRES_PORT", "5432"),
 				["DATABASE"] = configuration.GetValue("POSTGRES_DB", "kyooDB"),
 				["POOLING"] = "true",
@@ -55,11 +55,10 @@ public static class PostgresModule
 	public static void ConfigurePostgres(this WebApplicationBuilder builder)
 	{
 		NpgsqlDataSource dataSource = CreateDataSource(builder.Configuration);
-
 		builder.Services.AddDbContext<DatabaseContext, PostgresContext>(
 			x =>
 			{
-				x.UseNpgsql(dataSource).UseProjectables();
+				x.UseNpgsql(dataSource);
 				if (builder.Environment.IsDevelopment())
 					x.EnableDetailedErrors().EnableSensitiveDataLogging();
 			},