diff options
author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2018-12-22 03:11:08 -0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-12-22 03:11:08 -0800 |
commit | 792f10988ed2badcce9a11a880303614412b9a00 (patch) | |
tree | 96386ffcf059e1f5464db09e374e0cdc8a021430 /libpod/container.go | |
parent | 7122b49464519252a4f91ce1df337150ca24be42 (diff) | |
parent | c657dc4fdbca4b331d69e0910261e2cb11e2a629 (diff) | |
download | podman-792f10988ed2badcce9a11a880303614412b9a00.tar.gz podman-792f10988ed2badcce9a11a880303614412b9a00.tar.bz2 podman-792f10988ed2badcce9a11a880303614412b9a00.zip |
Merge pull request #2023 from rhatdan/config
Switch all references to image.ContainerConfig to image.Config
Diffstat (limited to 'libpod/container.go')
-rw-r--r-- | libpod/container.go | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libpod/container.go b/libpod/container.go index 18d867f41..b4190344a 100644 --- a/libpod/container.go +++ b/libpod/container.go @@ -112,7 +112,7 @@ func (ns LinuxNS) String() string { // syncContainer() immediately after locking. // ffjson: skip type Container struct { - config *ContainerConfig + config *Config state *containerState @@ -199,11 +199,11 @@ type ExecSession struct { PID int `json:"pid"` } -// ContainerConfig contains all information that was used to create the +// Config contains all information that was used to create the // container. It may not be changed once created. // It is stored, read-only, on disk // easyjson:json -type ContainerConfig struct { +type Config struct { Spec *spec.Spec `json:"spec"` ID string `json:"id"` Name string `json:"name"` @@ -382,8 +382,8 @@ func (t ContainerStatus) String() string { // Unlocked // Config returns the configuration used to create the container -func (c *Container) Config() *ContainerConfig { - returnConfig := new(ContainerConfig) +func (c *Container) Config() *Config { + returnConfig := new(Config) deepcopier.Copy(c.config).To(returnConfig) return returnConfig |