diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-02-21 13:25:59 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-21 13:25:59 -0500 |
| commit | 75ea3b67c6a5c3b6a3e4b7f5ae173c09c8e9c2d5 (patch) | |
| tree | 57279aee8328f9d7fc423fbecc8131e4f3cec648 /pkg | |
| parent | 5bdf5aeb71981a4951c039b1c795b24ca31ca705 (diff) | |
| parent | e3a549b7b1191a1667373cf60f8d08b96bbce7ba (diff) | |
| download | podman-75ea3b67c6a5c3b6a3e4b7f5ae173c09c8e9c2d5.tar.gz podman-75ea3b67c6a5c3b6a3e4b7f5ae173c09c8e9c2d5.tar.bz2 podman-75ea3b67c6a5c3b6a3e4b7f5ae173c09c8e9c2d5.zip | |
Merge pull request #5213 from mheon/remove_db_imagevol
Remove ImageVolumes from database
Diffstat (limited to 'pkg')
| -rw-r--r-- | pkg/spec/createconfig.go | 3 | ||||
| -rw-r--r-- | pkg/specgen/create.go | 4 |
2 files changed, 2 insertions, 5 deletions
diff --git a/pkg/spec/createconfig.go b/pkg/spec/createconfig.go index 5011df496..02678a687 100644 --- a/pkg/spec/createconfig.go +++ b/pkg/spec/createconfig.go @@ -341,9 +341,8 @@ func (c *CreateConfig) getContainerCreateOptions(runtime *libpod.Runtime, pod *l } options = append(options, nsOpts...) - useImageVolumes := c.ImageVolumeType == TypeBind // Gather up the options for NewContainer which consist of With... funcs - options = append(options, libpod.WithRootFSFromImage(c.ImageID, c.Image, useImageVolumes)) + options = append(options, libpod.WithRootFSFromImage(c.ImageID, c.Image)) options = append(options, libpod.WithConmonPidFile(c.ConmonPidFile)) options = append(options, libpod.WithLabels(c.Labels)) options = append(options, libpod.WithShmSize(c.Resources.ShmSize)) diff --git a/pkg/specgen/create.go b/pkg/specgen/create.go index c8fee5f05..34f9ffac2 100644 --- a/pkg/specgen/create.go +++ b/pkg/specgen/create.go @@ -36,9 +36,7 @@ func (s *SpecGenerator) MakeContainer(rt *libpod.Runtime) (*libpod.Container, er return nil, err } - // TODO mheon wants to talk with Dan about this - useImageVolumes := s.ImageVolumeMode == "bind" - options = append(options, libpod.WithRootFSFromImage(newImage.ID(), s.Image, useImageVolumes)) + options = append(options, libpod.WithRootFSFromImage(newImage.ID(), s.Image)) runtimeSpec, err := s.toOCISpec(rt, newImage) if err != nil { |