Skip to content

Commit 1b91582

Browse files
committed
add postgresql to aspire
1 parent b92a82f commit 1b91582

File tree

5 files changed

+17
-5
lines changed

5 files changed

+17
-5
lines changed

src/Directory.Packages.props

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,9 @@
1313
<PackageVersion Include="Ardalis.Specification.EntityFrameworkCore" Version="8.0.0" />
1414
<PackageVersion Include="Asp.Versioning.Http" Version="8.1.0" />
1515
<PackageVersion Include="Asp.Versioning.Mvc.ApiExplorer" Version="8.1.0" />
16+
<PackageVersion Include="Aspire.Hosting.PostgreSQL" Version="9.0.0" />
17+
<PackageVersion Include="Aspire.Hosting.Redis" Version="9.0.0" />
18+
<PackageVersion Include="Aspire.Hosting.Seq" Version="9.0.0" />
1619
<PackageVersion Include="Finbuckle.MultiTenant" Version="9.0.0" />
1720
<PackageVersion Include="Finbuckle.MultiTenant.AspNetCore" Version="9.0.0" />
1821
<PackageVersion Include="Finbuckle.MultiTenant.EntityFrameworkCore" Version="9.0.0" />

src/api/server/appsettings.Development.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"DatabaseOptions": {
33
"Provider": "postgresql",
4-
"ConnectionString": "Server=192.168.1.110;Database=fullstackherodb;User Id=postgres;Password=password"
4+
"ConnectionString": "Server=localhost;Database=fullstackhero;Port=5432;User Id=admin;Password=admin;"
55
},
66
"OriginOptions": {
77
"OriginUrl": "https://localhost:7000"

src/aspire/Host/Host.csproj

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,9 @@
1313

1414
<ItemGroup>
1515
<PackageReference Include="Aspire.Hosting.AppHost" />
16+
<PackageReference Include="Aspire.Hosting.PostgreSQL" />
17+
<PackageReference Include="Aspire.Hosting.Redis" />
18+
<PackageReference Include="Aspire.Hosting.Seq" />
1619
</ItemGroup>
1720

1821
<ItemGroup>

src/aspire/Host/Program.cs

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,17 @@
99
.WithBindMount("../../../compose/prometheus", "/etc/prometheus", isReadOnly: true)
1010
.WithHttpEndpoint(port: 9090, targetPort: 9090);
1111

12-
builder.AddProject<Projects.Server>("webapi");
12+
var username = builder.AddParameter("pg-username", "admin");
13+
var password = builder.AddParameter("pg-password", "admin");
1314

14-
builder.AddProject<Projects.Client>("blazor");
15+
var database = builder.AddPostgres("db", username, password, port: 5432)
16+
.WithDataVolume()
17+
.AddDatabase("fullstackhero");
18+
19+
var api = builder.AddProject<Projects.Server>("webapi")
20+
.WaitFor(database);
21+
22+
var blazor = builder.AddProject<Projects.Client>("blazor");
1523

1624
using var app = builder.Build();
1725

src/aspire/service-defaults/Extensions.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,6 @@ public static IHostApplicationBuilder ConfigureOpenTelemetry(this IHostApplicati
8383
.AddProcessInstrumentation()
8484
.AddMeter(MetricsConstants.Todos)
8585
.AddMeter(MetricsConstants.Catalog);
86-
//.AddConsoleExporter();
8786
})
8887
.WithTracing(tracing =>
8988
{
@@ -96,7 +95,6 @@ public static IHostApplicationBuilder ConfigureOpenTelemetry(this IHostApplicati
9695
.AddAspNetCoreInstrumentation(nci => nci.RecordException = true)
9796
.AddHttpClientInstrumentation()
9897
.AddEntityFrameworkCoreInstrumentation();
99-
//.AddConsoleExporter();
10098
});
10199

102100
builder.AddOpenTelemetryExporters();

0 commit comments

Comments
 (0)