mirror of
https://github.com/Radarr/Radarr.git
synced 2024-10-05 15:47:20 +02:00
Make postgres integration tests actually use postgres
This commit is contained in:
parent
a95f8fa873
commit
d58f0806f6
@ -14,11 +14,11 @@ public class PostgresOptions
|
||||
public static PostgresOptions GetOptions()
|
||||
{
|
||||
var config = new ConfigurationBuilder()
|
||||
.AddEnvironmentVariables("Radarr__")
|
||||
.AddEnvironmentVariables()
|
||||
.Build();
|
||||
|
||||
var postgresOptions = new PostgresOptions();
|
||||
config.GetSection("Postgres").Bind(postgresOptions);
|
||||
config.GetSection("Radarr:Postgres").Bind(postgresOptions);
|
||||
|
||||
return postgresOptions;
|
||||
}
|
||||
|
@ -8,8 +8,6 @@
|
||||
using System.Text;
|
||||
using DryIoc;
|
||||
using DryIoc.Microsoft.DependencyInjection;
|
||||
using FluentMigrator.Runner.Processors.Postgres;
|
||||
using Microsoft.AspNetCore.DataProtection;
|
||||
using Microsoft.AspNetCore.Hosting;
|
||||
using Microsoft.Extensions.Configuration;
|
||||
using Microsoft.Extensions.DependencyInjection;
|
||||
@ -17,7 +15,6 @@
|
||||
using Microsoft.Extensions.Hosting.WindowsServices;
|
||||
using NLog;
|
||||
using NzbDrone.Common.Composition.Extensions;
|
||||
using NzbDrone.Common.Disk;
|
||||
using NzbDrone.Common.EnvironmentInfo;
|
||||
using NzbDrone.Common.Exceptions;
|
||||
using NzbDrone.Common.Extensions;
|
||||
@ -135,7 +132,7 @@ public static IHostBuilder CreateConsoleHostBuilder(string[] args, StartupContex
|
||||
})
|
||||
.ConfigureServices(services =>
|
||||
{
|
||||
services.Configure<PostgresOptions>(config.GetSection("Postgres"));
|
||||
services.Configure<PostgresOptions>(config.GetSection("Radarr:Postgres"));
|
||||
})
|
||||
.ConfigureWebHost(builder =>
|
||||
{
|
||||
@ -207,7 +204,7 @@ private static IConfiguration GetConfiguration(StartupContext context)
|
||||
return new ConfigurationBuilder()
|
||||
.AddXmlFile(appFolder.GetConfigPath(), optional: true, reloadOnChange: false)
|
||||
.AddInMemoryCollection(new List<KeyValuePair<string, string>> { new ("dataProtectionFolder", appFolder.GetDataProtectionPath()) })
|
||||
.AddEnvironmentVariables("Radarr__")
|
||||
.AddEnvironmentVariables()
|
||||
.Build();
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user