summaryrefslogtreecommitdiff
path: root/libpod/pod_api.go
diff options
context:
space:
mode:
authorcdoern <cdoern@redhat.com>2021-09-01 10:59:23 -0400
committercdoern <cdoern@redhat.com>2021-09-14 08:32:07 -0400
commit84005330aa3d25cf6134fffc1bf20354d4a3dd85 (patch)
treeaef148fafb73e36c3fed0fd7c0f2696f98a71c79 /libpod/pod_api.go
parentad26684856551251100b945305f91246888ef153 (diff)
downloadpodman-84005330aa3d25cf6134fffc1bf20354d4a3dd85.tar.gz
podman-84005330aa3d25cf6134fffc1bf20354d4a3dd85.tar.bz2
podman-84005330aa3d25cf6134fffc1bf20354d4a3dd85.zip
Pod Volumes Support
added support for the --volume flag in pods using the new infra container design. users can specify all volume options they can with regular containers resolves #10379 Signed-off-by: cdoern <cdoern@redhat.com>
Diffstat (limited to 'libpod/pod_api.go')
-rw-r--r--libpod/pod_api.go7
1 files changed, 7 insertions, 0 deletions
diff --git a/libpod/pod_api.go b/libpod/pod_api.go
index 5f4d983b9..4e0acf950 100644
--- a/libpod/pod_api.go
+++ b/libpod/pod_api.go
@@ -582,6 +582,7 @@ func (p *Pod) Inspect() (*define.InspectPodData, error) {
// Infra config contains detailed information on the pod's infra
// container.
var infraConfig *define.InspectPodInfraConfig
+ var inspectMounts []define.InspectMount
if p.state.InfraContainerID != "" {
infra, err := p.runtime.GetContainer(p.state.InfraContainerID)
if err != nil {
@@ -597,6 +598,11 @@ func (p *Pod) Inspect() (*define.InspectPodData, error) {
infraConfig.CPUSetCPUs = p.ResourceLim().CPU.Cpus
infraConfig.PidNS = p.PidMode()
infraConfig.UserNS = p.UserNSMode()
+ namedVolumes, mounts := infra.sortUserVolumes(infra.Config().Spec)
+ inspectMounts, err = infra.GetInspectMounts(namedVolumes, infra.config.ImageVolumes, mounts)
+ if err != nil {
+ return nil, err
+ }
if len(infra.Config().ContainerNetworkConfig.DNSServer) > 0 {
infraConfig.DNSServer = make([]string, 0, len(infra.Config().ContainerNetworkConfig.DNSServer))
@@ -645,6 +651,7 @@ func (p *Pod) Inspect() (*define.InspectPodData, error) {
CPUSetCPUs: p.ResourceLim().CPU.Cpus,
CPUPeriod: p.CPUPeriod(),
CPUQuota: p.CPUQuota(),
+ Mounts: inspectMounts,
}
return &inspectData, nil