tyler.durden
/
compose
mirror of https://github.com/docker/compose.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #779 from docker/ulimits 

add support for ulimits.nofile
This commit is contained in:
Nicolas De loof 2020-10-16 16:12:02 +02:00 committed by GitHub
parent 77f8718f03 47344608b8
commit 31a0cf08d7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ecs/compatibility.go
View File

@ -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)
}
}
}

6
ecs/down.go
View File

@ -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{