Przeglądaj źródła

Merge pull request #779 from docker/ulimits

add support for ulimits.nofile
Nicolas De loof 5 lat temu
rodzic
commit
31a0cf08d7
2 zmienionych plików z 12 dodań i 3 usunięć
  1. 9 0
      ecs/compatibility.go
  2. 3 3
      ecs/down.go

+ 9 - 0
ecs/compatibility.go

@@ -136,3 +136,12 @@ func (c *fargateCompatibilityChecker) CheckLoggingDriver(config *types.LoggingCo
 		c.Unsupported("services.logging.driver %s is not supported", config.Driver)
 	}
 }
+
+func (c *fargateCompatibilityChecker) CheckUlimits(service *types.ServiceConfig) {
+	for k := range service.Ulimits {
+		if k != "nofile" {
+			c.Unsupported("services.ulimits.%s is not supported by Fargate", k)
+			delete(service.Ulimits, k)
+		}
+	}
+}

+ 3 - 3
ecs/down.go

@@ -28,12 +28,12 @@ func (b *ecsAPIService) Down(ctx context.Context, project string) error {
 		return err
 	}
 
-	err = resources.apply(awsTypeCapacityProvider, delete(ctx, b.aws.DeleteCapacityProvider))
+	err = resources.apply(awsTypeCapacityProvider, doDelete(ctx, b.aws.DeleteCapacityProvider))
 	if err != nil {
 		return err
 	}
 
-	err = resources.apply(awsTypeAutoscalingGroup, delete(ctx, b.aws.DeleteAutoscalingGroup))
+	err = resources.apply(awsTypeAutoscalingGroup, doDelete(ctx, b.aws.DeleteAutoscalingGroup))
 	if err != nil {
 		return err
 	}
@@ -62,7 +62,7 @@ func (b *ecsAPIService) previousStackEvents(ctx context.Context, project string)
 	return previousEvents, nil
 }
 
-func delete(ctx context.Context, delete func(ctx context.Context, arn string) error) func(r stackResource) error {
+func doDelete(ctx context.Context, delete func(ctx context.Context, arn string) error) func(r stackResource) error {
 	return func(r stackResource) error {
 		w := progress.ContextWriter(ctx)
 		w.Event(progress.Event{