Merge will include deploy resources (#1214)

2019-12-27 13:51:11 +08:00
parent a3a82f55fe
commit d2d0d61cf2
3 changed files with 22 additions and 1 deletions
@@ -555,6 +555,14 @@ func mergeComposeObject(oldCompose *types.Config, newCompose *types.Config) (*ty
 		if service.Deploy.Mode != "" {
 			tmpOldService.Deploy = service.Deploy
 		}
+		if service.Deploy.Resources.Limits != nil {
+			tmpOldService.Deploy.Resources.Limits = service.Deploy.Resources.Limits
+		}
+
+		if service.Deploy.Resources.Reservations != nil {
+			tmpOldService.Deploy.Resources.Reservations = service.Deploy.Resources.Reservations
+		}
+
 		if len(service.Devices) != 0 {
 			tmpOldService.Devices = service.Devices
 		}