Skip to content

Commit dece15f

Browse files
committed
[Bugfix] Re-add --timeout flag to compose service commands.
1 parent 13f9881 commit dece15f

1 file changed

Lines changed: 5 additions & 5 deletions

File tree

ecs-cli/modules/commands/compose/service/compose_service_command.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ func startServiceCommand(factory composeFactory.ProjectFactory) cli.Command {
7676
Name: "start",
7777
Usage: "Starts one copy of each of the containers on an existing ECS service by setting the desired count to 1 (only if the current desired count is 0).",
7878
Action: compose.WithProject(factory, compose.ProjectStart, true),
79-
Flags: command.OptionalConfigFlags(),
79+
Flags: append(command.OptionalConfigFlags(), ComposeServiceTimeoutFlag()),
8080
OnUsageError: command.UsageErrorFactory("start"),
8181
}
8282
}
@@ -86,7 +86,7 @@ func upServiceCommand(factory composeFactory.ProjectFactory) cli.Command {
8686
Name: "up",
8787
Usage: "Creates a new ECS service or updates an existing one according to your compose file. For new services or existing services with a current desired count of 0, the desired count for the service is set to 1. For existing services with non-zero desired counts, a new task definition is created to reflect any changes to the compose file and the service is updated to use that task definition. In this case, the desired count does not change.",
8888
Action: compose.WithProject(factory, compose.ProjectUp, true),
89-
Flags: append(deploymentConfigFlags(true), append(loadBalancerFlags(), command.OptionalConfigFlags()...)...),
89+
Flags: append(append(deploymentConfigFlags(true), append(loadBalancerFlags(), command.OptionalConfigFlags()...)...), ComposeServiceTimeoutFlag()),
9090
OnUsageError: command.UsageErrorFactory("up"),
9191
}
9292
}
@@ -107,7 +107,7 @@ func scaleServiceCommand(factory composeFactory.ProjectFactory) cli.Command {
107107
Name: "scale",
108108
Usage: "ecs-cli compose service scale [count] - scales the desired count of the service to the specified count",
109109
Action: compose.WithProject(factory, compose.ProjectScale, true),
110-
Flags: append(deploymentConfigFlags(false), command.OptionalConfigFlags()...),
110+
Flags: append(append(deploymentConfigFlags(false), command.OptionalConfigFlags()...), ComposeServiceTimeoutFlag()),
111111
OnUsageError: command.UsageErrorFactory("scale"),
112112
}
113113
}
@@ -117,7 +117,7 @@ func stopServiceCommand(factory composeFactory.ProjectFactory) cli.Command {
117117
Name: "stop",
118118
Usage: "Stops the running tasks that belong to the service created with the compose project. This command updates the desired count of the service to 0.",
119119
Action: compose.WithProject(factory, compose.ProjectStop, true),
120-
Flags: command.OptionalConfigFlags(),
120+
Flags: append(command.OptionalConfigFlags(), ComposeServiceTimeoutFlag()),
121121
OnUsageError: command.UsageErrorFactory("stop"),
122122
}
123123
}
@@ -128,7 +128,7 @@ func rmServiceCommand(factory composeFactory.ProjectFactory) cli.Command {
128128
Aliases: []string{"delete", "down"},
129129
Usage: "Updates the desired count of the service to 0 and then deletes the service.",
130130
Action: compose.WithProject(factory, compose.ProjectDown, true),
131-
Flags: command.OptionalConfigFlags(),
131+
Flags: append(command.OptionalConfigFlags(), ComposeServiceTimeoutFlag()),
132132
OnUsageError: command.UsageErrorFactory("rm"),
133133
}
134134
}

0 commit comments

Comments
 (0)