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

fix: add nil check of DriverConfig (#315)

Browse source
This commit is contained in:
Shunsuke Suzuki 2021-11-30 23:30:45 +09:00 committed by GitHub
parent 1e55894715
commit 62827ae478
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
internal/provider/resource_docker_container_structures.go
View file

@ -269,13 +269,16 @@ func getDockerContainerMounts(container types.ContainerJSON) []map[string]interf
"volume": v, "volume": v,
}) })
} }
opt := map[string]interface{}{
"no_copy": mount.VolumeOptions.NoCopy,
"labels": labels,
}
if mount.VolumeOptions.DriverConfig != nil {
opt["driver_name"] = mount.VolumeOptions.DriverConfig.Name
opt["driver_options"] = mount.VolumeOptions.DriverConfig.Options
}
m["volume_options"] = []map[string]interface{}{ m["volume_options"] = []map[string]interface{}{
{ opt,
"no_copy": mount.VolumeOptions.NoCopy,
"labels": labels,
"driver_name": mount.VolumeOptions.DriverConfig.Name,
"driver_options": mount.VolumeOptions.DriverConfig.Options,
},
} }
} }
if mount.TmpfsOptions != nil { if mount.TmpfsOptions != nil {