diff --git a/src/Microsoft.Tye.Hosting/DockerRunner.cs b/src/Microsoft.Tye.Hosting/DockerRunner.cs index 7e0ebaaf..9efdf9f9 100644 --- a/src/Microsoft.Tye.Hosting/DockerRunner.cs +++ b/src/Microsoft.Tye.Hosting/DockerRunner.cs @@ -159,6 +159,8 @@ namespace Microsoft.Tye.Hosting environment["APP_INSTANCE"] = replica; + status.Environment = environment; + foreach (var pair in environment) { environmentArguments += $"-e {pair.Key}={pair.Value} "; diff --git a/src/Microsoft.Tye.Hosting/Model/ProcessStatus.cs b/src/Microsoft.Tye.Hosting/Model/ProcessStatus.cs index b8794ce2..019f077f 100644 --- a/src/Microsoft.Tye.Hosting/Model/ProcessStatus.cs +++ b/src/Microsoft.Tye.Hosting/Model/ProcessStatus.cs @@ -15,6 +15,5 @@ namespace Microsoft.Tye.Hosting.Model public int? ExitCode { get; set; } public int? Pid { get; set; } - public IDictionary? Environment { get; set; } } } diff --git a/src/Microsoft.Tye.Hosting/Model/ReplicaStatus.cs b/src/Microsoft.Tye.Hosting/Model/ReplicaStatus.cs index f17ac285..3578ecb4 100644 --- a/src/Microsoft.Tye.Hosting/Model/ReplicaStatus.cs +++ b/src/Microsoft.Tye.Hosting/Model/ReplicaStatus.cs @@ -23,5 +23,7 @@ namespace Microsoft.Tye.Hosting.Model public Dictionary Items { get; } = new Dictionary(); public Dictionary Metrics { get; set; } = new Dictionary(); + + public IDictionary? Environment { get; set; } } } diff --git a/src/Microsoft.Tye.Hosting/Model/V1/V1ReplicaStatus.cs b/src/Microsoft.Tye.Hosting/Model/V1/V1ReplicaStatus.cs index b3695a7e..6617a49d 100644 --- a/src/Microsoft.Tye.Hosting/Model/V1/V1ReplicaStatus.cs +++ b/src/Microsoft.Tye.Hosting/Model/V1/V1ReplicaStatus.cs @@ -4,14 +4,11 @@ using System; using System.Collections.Generic; -using System.Text.Json; -using System.Text.Json.Serialization; namespace Microsoft.Tye.Hosting.Model.V1 { public class V1ReplicaStatus { - public V1ReplicaType Type { get; set; } public string? DockerCommand { get; set; } public string? ContainerId { get; set; } public string? Name { get; set; } diff --git a/src/Microsoft.Tye.Hosting/Model/V1/V1ReplicaType.cs b/src/Microsoft.Tye.Hosting/Model/V1/V1ReplicaType.cs deleted file mode 100644 index 5f5eb2dd..00000000 --- a/src/Microsoft.Tye.Hosting/Model/V1/V1ReplicaType.cs +++ /dev/null @@ -1,12 +0,0 @@ -// Licensed to the .NET Foundation under one or more agreements. -// The .NET Foundation licenses this file to you under the MIT license. -// See the LICENSE file in the project root for more information. - -namespace Microsoft.Tye.Hosting.Model.V1 -{ - public enum V1ReplicaType - { - Process, - Docker - } -} diff --git a/src/Microsoft.Tye.Hosting/TyeDashboardApi.cs b/src/Microsoft.Tye.Hosting/TyeDashboardApi.cs index 113c8377..101dfb6c 100644 --- a/src/Microsoft.Tye.Hosting/TyeDashboardApi.cs +++ b/src/Microsoft.Tye.Hosting/TyeDashboardApi.cs @@ -174,6 +174,7 @@ namespace Microsoft.Tye.Hosting { Name = replica.Value.Name, Ports = replica.Value.Ports, + Environment = replica.Value.Environment }; replicateDictionary[replica.Key] = replicaStatus; @@ -182,7 +183,6 @@ namespace Microsoft.Tye.Hosting { replicaStatus.Pid = processStatus.Pid; replicaStatus.ExitCode = processStatus.ExitCode; - replicaStatus.Environment = processStatus.Environment; } else if (replica.Value is DockerStatus dockerStatus) {