summaryrefslogtreecommitdiff
path: root/runconfig/config.go
diff options
context:
space:
mode:
Diffstat (limited to 'runconfig/config.go')
-rw-r--r--runconfig/config.go12
1 files changed, 2 insertions, 10 deletions
diff --git a/runconfig/config.go b/runconfig/config.go
index ebb6d3f6b9..3d236deb53 100644
--- a/runconfig/config.go
+++ b/runconfig/config.go
@@ -17,20 +17,12 @@ type ContainerDecoder struct{}
// DecodeConfig makes ContainerDecoder to implement httputils.ContainerDecoder
func (r ContainerDecoder) DecodeConfig(src io.Reader) (*container.Config, *container.HostConfig, *networktypes.NetworkingConfig, error) {
- c, hc, nc, err := decodeContainerConfig(src)
- if err != nil {
- return nil, nil, nil, err
- }
- return c, hc, nc, nil
+ return decodeContainerConfig(src)
}
// DecodeHostConfig makes ContainerDecoder to implement httputils.ContainerDecoder
func (r ContainerDecoder) DecodeHostConfig(src io.Reader) (*container.HostConfig, error) {
- hc, err := decodeHostConfig(src)
- if err != nil {
- return nil, err
- }
- return hc, nil
+ return decodeHostConfig(src)
}
// decodeContainerConfig decodes a json encoded config into a ContainerConfigWrapper