Skip to content

Commit

Permalink
pr fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
yhlee-aws committed Aug 21, 2018
1 parent 518bf2f commit 7361dd2
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
3 changes: 2 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
# Changelog

## 1.21.0-dev
## 1.20.2-dev
* Bug - Fixed a bug where unrecognized task cannot be stopped [#1467](https://github.com/aws/amazon-ecs-agent/pull/1467)
* Enhancement - Added ECS config field to provide optionally comparing shared volumes' full details (driver options and labels), or names only [#1519](https://github.com/aws/amazon-ecs-agent/pull/1519)

## 1.20.1
* Bug - Fixed a bug where the agent couldn't be upgraded if there are tasks that
Expand Down
4 changes: 2 additions & 2 deletions agent/api/task/task.go
Original file line number Diff line number Diff line change
Expand Up @@ -285,7 +285,7 @@ func (task *Task) volumeName(name string) string {

// initializeDockerVolumes checks the volume resource in the task to determine if the agent
// should create the volume before creating the container
func (task *Task) initializeDockerVolumes(SharedVolumeMatchFullConfig bool, dockerClient dockerapi.DockerClient, ctx context.Context) error {
func (task *Task) initializeDockerVolumes(sharedVolumeMatchFullConfig bool, dockerClient dockerapi.DockerClient, ctx context.Context) error {
for i, vol := range task.Volumes {
// No need to do this for non-docker volume, eg: host bind/empty volume
if vol.Type != DockerVolumeType {
Expand All @@ -304,7 +304,7 @@ func (task *Task) initializeDockerVolumes(SharedVolumeMatchFullConfig bool, dock
}
} else {
// Agent needs to create shared volume if that's auto provisioned
err := task.addSharedVolumes(SharedVolumeMatchFullConfig, ctx, dockerClient, &task.Volumes[i])
err := task.addSharedVolumes(sharedVolumeMatchFullConfig, ctx, dockerClient, &task.Volumes[i])
if err != nil {
return err
}
Expand Down

0 comments on commit 7361dd2

Please sign in to comment.