diff options
author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-01-08 07:06:09 -0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-01-08 07:06:09 -0800 |
commit | 9474b8cea239348d11c913b03b9461afaf663f0b (patch) | |
tree | 6bc89d8f2881c0eeb4df5d24b938c69008d8dce9 /libpod/container.go | |
parent | 4f19f1afcaa67f8e775e303b1b6627fb5abd9116 (diff) | |
parent | 5ed23327a9e68219f6d1eaf38e0533e732438eb5 (diff) | |
download | podman-9474b8cea239348d11c913b03b9461afaf663f0b.tar.gz podman-9474b8cea239348d11c913b03b9461afaf663f0b.tar.bz2 podman-9474b8cea239348d11c913b03b9461afaf663f0b.zip |
Merge pull request #2099 from mheon/config_to_containerconfig
Rename libpod.Config back to ContainerConfig
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 4e5088b32..44992c534 100644 --- a/libpod/container.go +++ b/libpod/container.go @@ -113,7 +113,7 @@ func (ns LinuxNS) String() string { // syncContainer() immediately after locking. // ffjson: skip type Container struct { - config *Config + config *ContainerConfig state *containerState @@ -200,11 +200,11 @@ type ExecSession struct { PID int `json:"pid"` } -// Config contains all information that was used to create the +// ContainerConfig 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 Config struct { +type ContainerConfig struct { Spec *spec.Spec `json:"spec"` ID string `json:"id"` Name string `json:"name"` @@ -385,8 +385,8 @@ func (t ContainerStatus) String() string { // Unlocked // Config returns the configuration used to create the container -func (c *Container) Config() *Config { - returnConfig := new(Config) +func (c *Container) Config() *ContainerConfig { + returnConfig := new(ContainerConfig) deepcopier.Copy(c.config).To(returnConfig) return returnConfig |