daemon: Daemon.getInspectData: also set Config

Now that the types are merged, we can also set the config in this
function while the container state is locked.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

daemon/inspect.go

@@ -87,7 +87,6 @@ func (daemon *Daemon) ContainerInspect(ctx context.Context, name string, options
 	}
 
 	base.Mounts = mountPoints
-	base.Config = ctr.Config
 	base.NetworkSettings = networkSettings
 	base.ImageManifestDescriptor = imageManifest
 
@@ -161,6 +160,7 @@ func (daemon *Daemon) getInspectData(daemonCfg *config.Config, ctr *container.Co
 		GraphDriver: storage.DriverData{
 			Name: ctr.Driver,
 		},
+		Config: ctr.Config,
 	}
 
 	// Now set any platform-specific fields