diff options
| author | Matthew Heon <mheon@redhat.com> | 2020-02-14 09:54:46 -0500 |
|---|---|---|
| committer | Matthew Heon <mheon@redhat.com> | 2020-02-21 09:37:30 -0500 |
| commit | e3a549b7b1191a1667373cf60f8d08b96bbce7ba (patch) | |
| tree | fd358c5c02aa58ffd15816c8fbe2daa67b9f7c55 /pkg | |
| parent | 4f5b40598f53915f138208e493279dfcfe70ab06 (diff) | |
| download | podman-e3a549b7b1191a1667373cf60f8d08b96bbce7ba.tar.gz podman-e3a549b7b1191a1667373cf60f8d08b96bbce7ba.tar.bz2 podman-e3a549b7b1191a1667373cf60f8d08b96bbce7ba.zip | |
Remove ImageVolumes from database
Before Libpod supported named volumes, we approximated image
volumes by bind-mounting in per-container temporary directories.
This was handled by Libpod, and had a corresponding database
entry to enable/disable it.
However, when we enabled named volumes, we completely rewrote the
old implementation; none of the old bind mount implementation
still exists, save one flag in the database. With nothing
remaining to use it, it has no further purpose.
Signed-off-by: Matthew Heon <mheon@redhat.com>
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 { |