From b7e09de3cb8709e5456b996984b5de8161202ef6 Mon Sep 17 00:00:00 2001 From: Paweł Bernaciak Date: Sun, 29 Oct 2023 16:07:04 +0100 Subject: Dockerize app for deployment and development --- backend/Elements.Backend/Elements.Backend.csproj | 3 ++- backend/Elements.Backend/Program.cs | 16 ++++++++++------ backend/Elements.Backend/Properties/launchSettings.json | 4 +--- 3 files changed, 13 insertions(+), 10 deletions(-) (limited to 'backend/Elements.Backend') diff --git a/backend/Elements.Backend/Elements.Backend.csproj b/backend/Elements.Backend/Elements.Backend.csproj index 787d048..426b45a 100644 --- a/backend/Elements.Backend/Elements.Backend.csproj +++ b/backend/Elements.Backend/Elements.Backend.csproj @@ -4,7 +4,7 @@ net7.0 enable enable - dae266ca-b349-4b87-a992-5470f9dd635d + portable @@ -17,6 +17,7 @@ + diff --git a/backend/Elements.Backend/Program.cs b/backend/Elements.Backend/Program.cs index f7b9b4b..6804d1a 100644 --- a/backend/Elements.Backend/Program.cs +++ b/backend/Elements.Backend/Program.cs @@ -14,13 +14,11 @@ builder.Services.AddControllers().AddJsonOptions(options => options.JsonSerializerOptions.PropertyNamingPolicy = JsonNamingPolicy.CamelCase; }); -if (builder.Environment.IsDevelopment()) +builder.Services.AddDbContext(options => { - builder.Services.AddDbContext(options => - { - options.UseSqlite("Data Source=elements.db"); - }); -} + options.UseNpgsql(Environment.GetEnvironmentVariable("ELEM_DB_CONN_STR") ?? + "Server=database;Port=5432;Database=elements;User Id=elements;Password=elementspass"); +}); builder.Services .AddAuthentication(options => @@ -52,6 +50,12 @@ builder.Services.AddHostedService( var app = builder.Build(); +using (var scope = app.Services.CreateScope()) +{ + ApplicationDbContext context = scope.ServiceProvider.GetRequiredService(); + context.Database.Migrate(); +} + app.UseHttpsRedirection(); app.UseAuthentication(); diff --git a/backend/Elements.Backend/Properties/launchSettings.json b/backend/Elements.Backend/Properties/launchSettings.json index 0a48056..1114d6c 100644 --- a/backend/Elements.Backend/Properties/launchSettings.json +++ b/backend/Elements.Backend/Properties/launchSettings.json @@ -12,9 +12,7 @@ "http": { "commandName": "Project", "dotnetRunMessages": true, - "launchBrowser": true, - "launchUrl": "swagger", - "applicationUrl": "http://localhost:5102", + "applicationUrl": "http://0.0.0.0:5102", "environmentVariables": { "ASPNETCORE_ENVIRONMENT": "Development" } -- cgit v1.2.3