From 93220d9d791094b2b8747fcd6491712912596f14 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=94=D0=BC=D0=B8=D1=82=D1=80=D0=B8=D0=B9=20=D0=A8=D0=B8?=
 =?UTF-8?q?=D0=BC=D0=B0=D0=BD=D1=81=D0=BA=D0=B8=D0=B9?= <yaflay@vk.com>
Date: Tue, 19 Dec 2023 20:50:17 +0300
Subject: [PATCH] add connetction string to docker args

---
 .gitignore | 1 -
 Dockerfile | 7 +++++--
 Program.cs | 2 +-
 Startup.cs | 7 ++++++-
 4 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index 1e9961e..e7c8a1d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -362,4 +362,3 @@ MigrationBackup/
 # Fody - auto-generated XML schema
 FodyWeavers.xsd
 /appsettings.json
-/appsettings.json
diff --git a/Dockerfile b/Dockerfile
index b30358a..08b803e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,10 @@
 ARG CLIENTID
 ARG CLIENTSECRET
 ARG REDIRECTURL
-
+ARG PSQL_HOST
+ARG PSQL_USER
+ARG PSQL_PASSWORD
+ARG PSQL_DATABASE
 FROM mcr.microsoft.com/dotnet/aspnet:7.0 AS base
 WORKDIR /app
 EXPOSE 80
@@ -17,7 +20,7 @@ WORKDIR "/src/."
 RUN dotnet build "yaflay.ru.csproj" -c Release -o /app/build 
 
 FROM build AS publish
-RUN dotnet publish "yaflay.ru.csproj" -c Release -o /app/publish /p:UseAppHost=false;redirectUrl=$REDIRECTURL;clientId=$CLIENTID;clientSecret=$CLIENTSECRET
+RUN dotnet publish "yaflay.ru.csproj" -c Release -o /app/publish /p:UseAppHost=false;redirectUrl=$REDIRECTURL;clientId=$CLIENTID;clientSecret=$CLIENTSECRET;Host=$PSQL_HOST;Username=$PSQL_USER;Password=$PSQL_PASSWORD;Database=$PSQL_DATABASE
 
 FROM base AS final
 WORKDIR /app
diff --git a/Program.cs b/Program.cs
index 6ad1f12..ef069fe 100644
--- a/Program.cs
+++ b/Program.cs
@@ -9,7 +9,7 @@ public class Program
         Startup.clientId = parse("clientId");
         Startup.clientSecret = parse("clientSecret");
         Startup.redirectUrl = parse("redirectUrl");
-        
+        Startup.connectionString = $"Host={parse("Host")};Username={parse("Username")};Password={parse("Password")};Database={parse("Database")}";
         CreateHostBuilder()
         .Build()
         .Run();
diff --git a/Startup.cs b/Startup.cs
index 8f8126f..1994cd7 100644
--- a/Startup.cs
+++ b/Startup.cs
@@ -20,6 +20,7 @@ namespace yaflay.ru
         public static string? clientId = null;
         public static string? clientSecret = null;
         public static string? redirectUrl = null;
+        public static string? connectionString { private get; set; } = null;
         public Startup()
         {
             configuration = new ConfigurationBuilder()
@@ -32,6 +33,10 @@ namespace yaflay.ru
                 clientSecret = configuration.GetValue<string>("clientSecret");
                 redirectUrl = configuration.GetValue<string>("redirectUrl");
             }
+            if (connectionString == null)
+            {
+                connectionString = configuration.GetValue<string>("connectionString");
+            }
             
         }
         public void ConfigureServices(IServiceCollection services)
@@ -49,7 +54,7 @@ namespace yaflay.ru
             services
                 .AddRouting()
                 .AddSingleton(configuration)
-                .AddDbContext<AppDbContext>(c => c.UseNpgsql(connectionString: configuration.GetValue<string>("connectionOnServer")))
+                .AddDbContext<AppDbContext>(c => c.UseNpgsql(connectionString: connectionString))
                 .AddCoreAdmin("Admin");
             services.AddRazorPages();
             services.AddCors(k => { k.AddDefaultPolicy(l => { l.AllowAnyHeader(); l.AllowAnyMethod(); l.AllowAnyOrigin(); }); })