diff options
author | Daniel J Walsh <dwalsh@redhat.com> | 2018-01-18 15:23:53 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-01-18 15:23:53 -0500 |
commit | f773605821990db4358d3b6f37479b5ea094b6e9 (patch) | |
tree | 0d932cf3e33e5996f02b40ddd6e1b01b0c6f87de /libpod/sql_state_internal.go | |
parent | 858116f648a06a0f4df829bc1e78b46a5e609b57 (diff) | |
parent | ae2ffc31d3a8d37419d05aab2f0d36841fae3974 (diff) | |
download | podman-f773605821990db4358d3b6f37479b5ea094b6e9.tar.gz podman-f773605821990db4358d3b6f37479b5ea094b6e9.tar.bz2 podman-f773605821990db4358d3b6f37479b5ea094b6e9.zip |
Merge pull request #240 from mheon/refactor_container
Refactor container.go
Diffstat (limited to 'libpod/sql_state_internal.go')
-rw-r--r-- | libpod/sql_state_internal.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libpod/sql_state_internal.go b/libpod/sql_state_internal.go index 189fae190..24d5d8bd4 100644 --- a/libpod/sql_state_internal.go +++ b/libpod/sql_state_internal.go @@ -467,7 +467,7 @@ func (s *SQLState) ctrFromScannable(row scannable) (*Container, error) { ctr := new(Container) ctr.config = new(ContainerConfig) - ctr.state = new(containerRuntimeInfo) + ctr.state = new(containerState) ctr.config.ID = id ctr.config.Name = name @@ -502,7 +502,7 @@ func (s *SQLState) ctrFromScannable(row scannable) (*Container, error) { ctr.config.StopTimeout = stopTimeout ctr.config.CgroupParent = cgroupParent - ctr.state.State = ContainerState(state) + ctr.state.State = ContainerStatus(state) ctr.state.ConfigPath = configPath ctr.state.RunDir = runDir ctr.state.Mountpoint = mountpoint |