Ajusts label location

ragoso · Mar 25, 2021 · eeaea23 · eeaea23
1 parent c62494f
commit eeaea23
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/Docker/DockerService.cs b/Docker/DockerService.cs
@@ -38,6 +38,8 @@ public class ContainerSpec
     {
         public string Image { get; set; }
         public List<Mount> Mounts { get; set; }
+
+        public IDictionary<string, string> Labels { get; set; }
         public string User { get; set; }
     }
 
@@ -134,7 +136,6 @@ public class DockerService
         public Mode Mode { get; set; }
         public UpdateConfig UpdateConfig { get; set; }
         public EndpointSpec EndpointSpec { get; set; }
-        public IDictionary<string, string> Labels { get; set; }
     }
 
 

diff --git a/Docker/DockerServiceResponse.cs b/Docker/DockerServiceResponse.cs
@@ -14,7 +14,7 @@ public class DockerServiceResponse
         [JsonIgnore]
         public IEnumerable<string> Networks => Spec.TaskTemplate.Networks?.Select(x => x.Target);
         [JsonIgnore]
-        public IDictionary<string, string> Labels => Spec.Labels;
+        public IDictionary<string, string> Labels => Spec.TaskTemplate.ContainerSpec.Labels;
         [JsonIgnore]
         public IEnumerable<Mount> Mounts => Spec.TaskTemplate.ContainerSpec.Mounts;
         [JsonIgnore]

diff --git a/Docker/Extensions.cs b/Docker/Extensions.cs
@@ -19,12 +19,12 @@ public static DockerServiceResponse GetDockerService(this MyService myService)
                 Spec = new DockerService()
                     {
                         Name = myService.Name,
-                        Labels = myService.Labels,
                         TaskTemplate = new TaskTemplate()
                         {
                             ContainerSpec = new ContainerSpec()
                             {
                                 Image = myService.Image,
+                                Labels = myService.Labels,
                                 Mounts = myService.Volumes?.Select(x => new Mount()
                                 {
                                     ReadOnly = x.ReadOnly,