Browse Source

Revert changes to Dockerfile step (#270)

Reverting a part of #236
pull/274/head
Justin Kotalik 7 years ago
committed by GitHub
parent
commit
498c91a6fa
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 10
      src/Microsoft.Tye.Core/GenerateDockerfileStep.cs

10
src/Microsoft.Tye.Core/GenerateDockerfileStep.cs

@ -13,16 +13,16 @@ namespace Microsoft.Tye
public bool Force { get; set; } 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)) if (SkipWithoutProject(output, service, out var project))
{ {
return Task.CompletedTask; return;
} }
if (SkipWithoutContainerInfo(output, service, out var container)) if (SkipWithoutContainerInfo(output, service, out var container))
{ {
return Task.CompletedTask; return;
} }
if (container.UseMultiphaseDockerfile == false) if (container.UseMultiphaseDockerfile == false)
@ -40,8 +40,8 @@ namespace Microsoft.Tye
File.Delete(dockerFilePath); File.Delete(dockerFilePath);
output.WriteInfoLine($"Generating Dockerfile at '{dockerFilePath}'."); await DockerfileGenerator.WriteDockerfileAsync(output, application, project, container, dockerFilePath);
return DockerfileGenerator.WriteDockerfileAsync(output, application, project, container, dockerFilePath); output.WriteInfoLine($"Generated Dockerfile at '{dockerFilePath}'.");
} }
} }
} }

Loading…
Cancel
Save