diff --git a/src/Aspire.Hosting.Docker/DockerComposeEnvironmentResource.cs b/src/Aspire.Hosting.Docker/DockerComposeEnvironmentResource.cs index e7d6d3eae98..301bbc03abe 100644 --- a/src/Aspire.Hosting.Docker/DockerComposeEnvironmentResource.cs +++ b/src/Aspire.Hosting.Docker/DockerComposeEnvironmentResource.cs @@ -252,7 +252,7 @@ private async Task DockerComposeUpAsync(PipelineStepContext context) } else { - await deployTask.CompleteAsync($"Docker Compose deployment complete for **{Name}**", CompletionState.Completed, context.CancellationToken).ConfigureAwait(false); + await deployTask.CompleteAsync($"Service **{Name}** is now running with Docker Compose locally", CompletionState.Completed, context.CancellationToken).ConfigureAwait(false); } } } @@ -364,7 +364,7 @@ private string GetEnvFilePath(PipelineStepContext context) var outputPath = PublishingContextUtils.GetEnvironmentOutputPath(context, this); var hostEnvironment = context.Services.GetService(); var environmentName = hostEnvironment?.EnvironmentName ?? Name; - var envFilePath = Path.Combine(outputPath, $"{environmentName}.env"); + var envFilePath = Path.Combine(outputPath, $".env.{environmentName}"); return envFilePath; } } diff --git a/src/Aspire.Hosting.Docker/DockerComposePublisherLoggerExtensions.cs b/src/Aspire.Hosting.Docker/DockerComposePublisherLoggerExtensions.cs index d2d4390859b..fbd541c0a30 100644 --- a/src/Aspire.Hosting.Docker/DockerComposePublisherLoggerExtensions.cs +++ b/src/Aspire.Hosting.Docker/DockerComposePublisherLoggerExtensions.cs @@ -25,7 +25,7 @@ internal static partial class DockerComposePublisherLoggerExtensions [LoggerMessage(LogLevel.Information, "No resources found in the model.")] internal static partial void EmptyModel(this ILogger logger); - [LoggerMessage(LogLevel.Information, "Successfully generated Compose output in '{OutputPath}'")] + [LoggerMessage(LogLevel.Debug, "Successfully generated Compose output in '{OutputPath}'")] internal static partial void FinishGeneratingDockerCompose(this ILogger logger, string outputPath); [LoggerMessage(LogLevel.Warning, "Failed to get container image for resource '{ResourceName}', it will be skipped in the output.")] diff --git a/tests/Aspire.Hosting.Docker.Tests/DockerComposePublisherTests.cs b/tests/Aspire.Hosting.Docker.Tests/DockerComposePublisherTests.cs index 8f12bd103dd..a834f8425c6 100644 --- a/tests/Aspire.Hosting.Docker.Tests/DockerComposePublisherTests.cs +++ b/tests/Aspire.Hosting.Docker.Tests/DockerComposePublisherTests.cs @@ -520,7 +520,7 @@ public async Task PrepareStep_GeneratesCorrectEnvFileWithDefaultEnvironmentName( var app = builder.Build(); app.Run(); - var envFileContent = await File.ReadAllTextAsync(Path.Combine(tempDir.Path, "Production.env")); + var envFileContent = await File.ReadAllTextAsync(Path.Combine(tempDir.Path, ".env.Production")); await Verify(envFileContent, "env") .UseParameters("default-environment"); } @@ -549,7 +549,7 @@ public async Task PrepareStep_GeneratesCorrectEnvFileWithCustomEnvironmentName() app.Run(); // Verify that the env file is created with the custom environment name - var envFilePath = Path.Combine(tempDir.Path, "Staging.env"); + var envFilePath = Path.Combine(tempDir.Path, ".env.Staging"); Assert.True(File.Exists(envFilePath), $"Expected env file at {envFilePath}"); var envFileContent = await File.ReadAllTextAsync(envFilePath); @@ -583,7 +583,7 @@ public async Task PrepareStep_GeneratesEnvFileWithVariousParameterTypes() var app = builder.Build(); app.Run(); - var envFileContent = await File.ReadAllTextAsync(Path.Combine(tempDir.Path, "Production.env")); + var envFileContent = await File.ReadAllTextAsync(Path.Combine(tempDir.Path, ".env.Production")); await Verify(envFileContent, "env") .UseParameters("various-parameters"); }