v2specgen prune libpod

use libpod only in the specgen/generate package so that the remote clients do not inherit libpod bloat.

Signed-off-by: Brent Baude <bbaude@redhat.com>
This commit is contained in:
Brent Baude
2020-04-14 14:13:06 -05:00
parent 0d01f09bf4
commit 7147187942
13 changed files with 483 additions and 425 deletions

View File

@ -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{