Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
]
}
},
"forwardPorts": [5601, 7101, 7111, 7121, 7131, 8025],
"forwardPorts": [5601, 7101, 7111, 7121, 7131, 8026],
"otherPortsAttributes": {
"onAutoForward": "ignore"
},
Expand All @@ -53,7 +53,7 @@
"label": "App",
"protocol": "https"
},
"8025": {
"8026": {
"label": "Mail UI"
}
},
Expand Down
22 changes: 0 additions & 22 deletions src/Exceptionless.AppHost/Extensions/AspireExtensions.cs

This file was deleted.

12 changes: 6 additions & 6 deletions src/Exceptionless.AppHost/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
int docsPort = worktreePorts?.DocsHttp ?? 7141;
const int DefaultApiHttpsPort = 7111;
string exceptionlessServerUrl = worktreePorts?.ApiHttpsUrl ?? $"https://api-ex.dev.localhost:{DefaultApiHttpsPort}";
const string SharedEmailConnectionString = "smtp://localhost:1025";
const string SharedEmailConnectionString = "smtp://localhost:1026";

var elastic = builder.AddElasticsearch("Elasticsearch", port: 9200)
.WithDataVolume("exceptionless.data.v1")
Expand All @@ -39,7 +39,8 @@
var storageBlobs = storage.AddBlobs("StorageBlobs");
var storageQueues = storage.AddQueues("StorageQueues");

var cache = builder.AddRedis("Redis", port: 6379)
// Aspire reserves 6380 for Redis's secondary non-TLS endpoint when proxying is disabled.
var cache = builder.AddRedis("Redis", port: 6381)
.WithImageTag("8.6")
.WithDataVolume("exceptionless.redis.data.v1")
.WithEndpointProxySupport(false)
Expand All @@ -55,10 +56,10 @@
var mail = builder.AddContainer("Mail", "axllent/mailpit")
.WithImageTag("v1.27.10")
.WithEndpointProxySupport(false)
.WithHttpEndpoint(8025, 8025, "http")
.WithHttpEndpoint(port: 8026, targetPort: 8025, name: "http")
Comment thread
ejsmith marked this conversation as resolved.
.WithUrlForEndpoint("http", u => { u.DisplayText = "Mail"; u.DisplayOrder = 100; })
.WithHttpHealthCheck("/readyz")
.WithEndpoint(1025, 1025)
.WithEndpoint(targetPort: 1025, port: 1026)
.WithUrlForEndpoint("tcp", u => u.DisplayLocation = UrlDisplayLocation.DetailsOnly);

var ownedElastic = elastic;
Expand All @@ -85,6 +86,7 @@
cache = cache.WithRedisInsight(b => b
.WithLifetime(ContainerLifetime.Persistent)
.WithEndpointProxySupport(false)
.WithHostPort(5541)
.WithContainerName("Exceptionless-RedisInsight")
.WithUrlForEndpoint("http", u => u.DisplayText = "Redis")
.WithParentRelationship(ownedCache), containerName: "Redis-insight");
Expand Down Expand Up @@ -152,7 +154,6 @@
var oldApp = builder.AddJavaScriptApp("OldApp", "../../src/Exceptionless.Web/ClientApp.angular", "serve")
.WithBrowserLogs()
.WithReference(api)
.RemoveJavaScriptDebuggingAnnotation()
.WithEnvironment("ASPNETCORE_URLS", oldAppAspNetCoreUrls)
.WithEnvironment("USE_HTTPS", "true")
.WithEnvironment("LIVERELOAD_PORT", oldAppLiveReloadPort.ToString())
Expand Down Expand Up @@ -180,7 +181,6 @@
.WithBrowserLogs()
.WithReference(api)
.WithReference(oldApp)
.RemoveJavaScriptDebuggingAnnotation()
.WithEnvironment("PUBLIC_EXCEPTIONLESS_SERVER_URL", exceptionlessServerUrl)
.WithEnvironment("PORT", appPort.ToString())
.WithEndpoint("http", e =>
Expand Down
Loading