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/boltdb_state.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/boltdb_state.go')
| -rw-r--r-- | libpod/boltdb_state.go | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libpod/boltdb_state.go b/libpod/boltdb_state.go index ba8f7375a..b154d8bda 100644 --- a/libpod/boltdb_state.go +++ b/libpod/boltdb_state.go @@ -322,7 +322,7 @@ func (s *BoltState) Container(id string) (*Container, error) { ctrID := []byte(id) ctr := new(Container) - ctr.config = new(Config) + ctr.config = new(ContainerConfig) ctr.state = new(containerState) db, err := s.getDBCon() @@ -358,7 +358,7 @@ func (s *BoltState) LookupContainer(idOrName string) (*Container, error) { } ctr := new(Container) - ctr.config = new(Config) + ctr.config = new(ContainerConfig) ctr.state = new(containerState) db, err := s.getDBCon() @@ -751,7 +751,7 @@ func (s *BoltState) AllContainers() ([]*Container, error) { } ctr := new(Container) - ctr.config = new(Config) + ctr.config = new(ContainerConfig) ctr.state = new(containerState) if err := s.getContainerFromDB(id, ctr, ctrBucket); err != nil { @@ -1137,7 +1137,7 @@ func (s *BoltState) PodContainers(pod *Pod) ([]*Container, error) { // Iterate through all containers in the pod err = podCtrs.ForEach(func(id, val []byte) error { newCtr := new(Container) - newCtr.config = new(Config) + newCtr.config = new(ContainerConfig) newCtr.state = new(containerState) ctrs = append(ctrs, newCtr) |