Return empty Config fields, now omitempty, for API < 1.21

Signed-off-by: Antonio Murdaca <runcom@redhat.com>
This commit is contained in:
Antonio Murdaca
2015-10-22 15:07:05 -04:00
committed by Tibor Vass
parent 2b4c34e756
commit 392fe9e507
5 changed files with 50 additions and 3 deletions
+5
View File
@@ -3,6 +3,7 @@ package v1p19
import (
"github.com/docker/docker/api/types"
"github.com/docker/docker/pkg/nat"
"github.com/docker/docker/runconfig"
)
@@ -19,6 +20,10 @@ type ContainerJSON struct {
type ContainerConfig struct {
*runconfig.Config
MacAddress string
NetworkDisabled bool
ExposedPorts map[nat.Port]struct{}
// backward compatibility, they now live in HostConfig
VolumeDriver string
Memory int64
+5
View File
@@ -3,6 +3,7 @@ package v1p20
import (
"github.com/docker/docker/api/types"
"github.com/docker/docker/pkg/nat"
"github.com/docker/docker/runconfig"
)
@@ -17,6 +18,10 @@ type ContainerJSON struct {
type ContainerConfig struct {
*runconfig.Config
MacAddress string
NetworkDisabled bool
ExposedPorts map[nat.Port]struct{}
// backward compatibility, they now live in HostConfig
VolumeDriver string
}