From 498c91a6fa5541356757860b01111d8276201cf7 Mon Sep 17 00:00:00 2001 From: Justin Kotalik Date: Mon, 30 Mar 2020 13:51:02 -0700 Subject: [PATCH] Revert changes to Dockerfile step (#270) Reverting a part of #236 --- src/Microsoft.Tye.Core/GenerateDockerfileStep.cs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Microsoft.Tye.Core/GenerateDockerfileStep.cs b/src/Microsoft.Tye.Core/GenerateDockerfileStep.cs index a80af636..f871820a 100644 --- a/src/Microsoft.Tye.Core/GenerateDockerfileStep.cs +++ b/src/Microsoft.Tye.Core/GenerateDockerfileStep.cs @@ -13,16 +13,16 @@ namespace Microsoft.Tye public bool Force { get; set; } - public override Task ExecuteAsync(OutputContext output, ApplicationBuilder application, ServiceBuilder service) + public override async Task ExecuteAsync(OutputContext output, ApplicationBuilder application, ServiceBuilder service) { if (SkipWithoutProject(output, service, out var project)) { - return Task.CompletedTask; + return; } if (SkipWithoutContainerInfo(output, service, out var container)) { - return Task.CompletedTask; + return; } if (container.UseMultiphaseDockerfile == false) @@ -40,8 +40,8 @@ namespace Microsoft.Tye File.Delete(dockerFilePath); - output.WriteInfoLine($"Generating Dockerfile at '{dockerFilePath}'."); - return DockerfileGenerator.WriteDockerfileAsync(output, application, project, container, dockerFilePath); + await DockerfileGenerator.WriteDockerfileAsync(output, application, project, container, dockerFilePath); + output.WriteInfoLine($"Generated Dockerfile at '{dockerFilePath}'."); } } }