diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-04-15 16:38:52 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-15 16:38:52 +0200 |
| commit | 37ed662f323ef4700ae14d441fb2264a59960baa (patch) | |
| tree | f69f267eb26f166d6347e7c3bba0579c274dbba3 /pkg/specgen/specgen.go | |
| parent | a756161e80cd32b705bb0dfe3ec4753f883ec929 (diff) | |
| parent | 714718794236245e81d4552f30731157d731aa9d (diff) | |
| download | podman-37ed662f323ef4700ae14d441fb2264a59960baa.tar.gz podman-37ed662f323ef4700ae14d441fb2264a59960baa.tar.bz2 podman-37ed662f323ef4700ae14d441fb2264a59960baa.zip | |
Merge pull request #5814 from baude/v2specgenprunelibpod
v2specgen prune libpod
Diffstat (limited to 'pkg/specgen/specgen.go')
| -rw-r--r-- | pkg/specgen/specgen.go | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/pkg/specgen/specgen.go b/pkg/specgen/specgen.go index 2e6dd9c1d..8482ef2c9 100644 --- a/pkg/specgen/specgen.go +++ b/pkg/specgen/specgen.go @@ -4,8 +4,6 @@ import ( "net" "syscall" - "github.com/containers/libpod/libpod" - "github.com/containers/image/v5/manifest" "github.com/containers/libpod/pkg/rootless" "github.com/containers/storage" @@ -174,7 +172,7 @@ type ContainerStorageConfig struct { // These will supersede Image Volumes and VolumesFrom volumes where // there are conflicts. // Optional. - Volumes []*libpod.ContainerNamedVolume `json:"volumes,omitempty"` + Volumes []*Volumes `json:"volumes,omitempty"` // Devices are devices that will be added to the container. // Optional. Devices []spec.LinuxDevice `json:"devices,omitempty"` @@ -403,6 +401,13 @@ type SpecGenerator struct { ContainerHealthCheckConfig } +// Volumes is a temporary struct to hold input from the User +type Volumes struct { + Name string + Dest string + Options []string +} + // NewSpecGenerator returns a SpecGenerator struct given one of two mandatory inputs func NewSpecGenerator(image string) *SpecGenerator { networkConfig := ContainerNetworkConfig{ |