From 2b126934eea55eaef50e4e8345d926d20ccaf86a Mon Sep 17 00:00:00 2001 From: newuser Date: Thu, 3 Dec 2020 00:23:26 +0600 Subject: [PATCH] #380 make running proxy container be logged at DEBUG level (#828) * #380 make running proxy container be logged at DEBUG level * Update DockerRunner.cs * Update DockerRunInfo.cs * Update DockerRunner.cs * Update DockerRunInfo.cs Co-authored-by: PBA\ShevchukPA Co-authored-by: Justin Kotalik --- src/Microsoft.Tye.Hosting/DockerRunner.cs | 12 ++++++++++-- src/Microsoft.Tye.Hosting/Model/DockerRunInfo.cs | 4 ++++ 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/src/Microsoft.Tye.Hosting/DockerRunner.cs b/src/Microsoft.Tye.Hosting/DockerRunner.cs index 370d7764..d6e2ecbd 100644 --- a/src/Microsoft.Tye.Hosting/DockerRunner.cs +++ b/src/Microsoft.Tye.Hosting/DockerRunner.cs @@ -66,7 +66,8 @@ namespace Microsoft.Tye.Hosting { WorkingDirectory = "/app", NetworkAlias = service.Description.Name, - Private = true + Private = true, + IsProxy = true }; var proxyLocation = Path.GetDirectoryName(typeof(Microsoft.Tye.Proxy.Program).Assembly.Location); proxyContainer.VolumeMappings.Add(new DockerVolume(proxyLocation, name: null, target: "/app")); @@ -295,7 +296,14 @@ namespace Microsoft.Tye.Hosting var command = $"run -d {workingDirectory} {volumes} {environmentArguments} {portString} --name {replica} --restart=unless-stopped {dockerImage} {docker.Args ?? ""}"; - _logger.LogInformation("Running image {Image} for {Replica}", docker.Image, replica); + if (!docker.IsProxy) + { + _logger.LogInformation("Running image {Image} for {Replica}", docker.Image, replica); + } + else + { + _logger.LogDebug("Running proxy image {Image} for {Replica}", docker.Image, replica); + } service.Logs.OnNext($"[{replica}]: docker {command}"); diff --git a/src/Microsoft.Tye.Hosting/Model/DockerRunInfo.cs b/src/Microsoft.Tye.Hosting/Model/DockerRunInfo.cs index e2b8155b..16ac49ca 100644 --- a/src/Microsoft.Tye.Hosting/Model/DockerRunInfo.cs +++ b/src/Microsoft.Tye.Hosting/Model/DockerRunInfo.cs @@ -16,7 +16,10 @@ namespace Microsoft.Tye.Hosting.Model Args = args; } + public bool IsProxy { get; set; } + public bool Private { get; set; } + public bool IsAspNet { get; set; } public string? NetworkAlias { get; set; } @@ -26,6 +29,7 @@ namespace Microsoft.Tye.Hosting.Model public List VolumeMappings { get; } = new List(); public string? Args { get; } + public Dictionary BuildArgs { get; set; } = new Dictionary(); public string Image { get; }