upstream/terraform-provider-docker
1
0
Fork 0
mirror of https://github.com/kreuzwerker/terraform-provider-docker.git synced 2025-12-31 04:00:06 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: destroy_grace_seconds are considered (#179)

Browse source 
Closes #174
This commit is contained in:
Laurie Odgers 2019-08-30 04:04:50 +10:00 committed by Manuel Vogel
parent 8a5b696b49
commit 8d4a71be3d
1 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
docker/resource_docker_container_funcs.go
View file

@ -8,7 +8,6 @@ import (
"errors"
"fmt"
"log"
"math/rand"
"os"
"sort"
"strconv"
@ -569,9 +568,8 @@ func resourceDockerContainerDelete(d *schema.ResourceData, meta interface{}) err
if !d.Get("attach").(bool) {
// Stop the container before removing if destroy_grace_seconds is defined
if d.Get("destroy_grace_seconds").(int) > 0 {
mapped := int32(d.Get("destroy_grace_seconds").(int))
timeoutInSeconds := rand.Int31n(mapped)
timeout := time.Duration(time.Duration(timeoutInSeconds) * time.Second)
timeout := time.Duration(int32(d.Get("destroy_grace_seconds").(int))) * time.Second
if err := client.ContainerStop(context.Background(), d.Id(), &timeout); err != nil {
return fmt.Errorf("Error stopping container %s: %s", d.Id(), err)
}