opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-07-31 12:22:29 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #11409 from cdoern/podVolumes

Browse Source 
Pod Volumes Support
This commit is contained in:
OpenShift Merge Robot
2021-09-15 09:10:12 -04:00
committed by GitHub
parent 4dd7bfdfaa 84005330aa
commit 4b6ffda31c
11 changed files with 265 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
pkg/specgen/generate/container_create.go
View File

@ -28,15 +28,27 @@ func MakeContainer(ctx context.Context, rt *libpod.Runtime, s *specgen.SpecGener
return nil, nil, nil, err
}
// If joining a pod, retrieve the pod for use.
// If joining a pod, retrieve the pod for use, and its infra container
var pod *libpod.Pod
var cont *libpod.Container
var config *libpod.ContainerConfig
if s.Pod != "" {
pod, err = rt.LookupPod(s.Pod)
if err != nil {
return nil, nil, nil, errors.Wrapf(err, "error retrieving pod %s", s.Pod)
}
if pod.HasInfraContainer() {
cont, err = pod.InfraContainer()
if err != nil {
return nil, nil, nil, err
}
config = cont.Config()
}
}
if config != nil && (len(config.NamedVolumes) > 0 || len(config.UserVolumes) > 0 || len(config.ImageVolumes) > 0 || len(config.OverlayVolumes) > 0) {
s.VolumesFrom = append(s.VolumesFrom, config.ID)
}
// Set defaults for unset namespaces
if s.PidNS.IsDefault() {
defaultNS, err := GetDefaultNamespaceMode("pid", rtc, pod)