opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-09-20 11:13:54 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9604 from mheon/fix_9510

Browse Source 
Compat API: create volume source dirs on the host
This commit is contained in:
OpenShift Merge Robot
2021-03-04 13:46:56 -05:00
committed by GitHub
parent 7a92de4bac 53d22c779c
commit e65bcc166c
2 changed files with 18 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
cmd/podman/common/create_opts.go
View File

@ -3,6 +3,7 @@ package common
import ( import (
"fmt" "fmt"
"net" "net"
"os"
"path/filepath" "path/filepath"
"strconv" "strconv"
"strings" "strings"
@ -13,6 +14,7 @@ import (
"github.com/containers/podman/v3/pkg/domain/entities" "github.com/containers/podman/v3/pkg/domain/entities"
"github.com/containers/podman/v3/pkg/rootless" "github.com/containers/podman/v3/pkg/rootless"
"github.com/containers/podman/v3/pkg/specgen" "github.com/containers/podman/v3/pkg/specgen"
"github.com/pkg/errors"
) )
type ContainerCLIOpts struct { type ContainerCLIOpts struct {
@ -397,6 +399,7 @@ func ContainerCreateToContainerCLIOpts(cc handlers.CreateContainerConfig, cgroup
} }
// volumes // volumes
volSources := make(map[string]bool)
volDestinations := make(map[string]bool) volDestinations := make(map[string]bool)
for _, vol := range cc.HostConfig.Binds { for _, vol := range cc.HostConfig.Binds {
cliOpts.Volume = append(cliOpts.Volume, vol) cliOpts.Volume = append(cliOpts.Volume, vol)
@ -407,6 +410,7 @@ func ContainerCreateToContainerCLIOpts(cc handlers.CreateContainerConfig, cgroup
case 1: case 1:
volDestinations[vol] = true volDestinations[vol] = true
default: default:
volSources[splitVol[0]] = true
volDestinations[splitVol[1]] = true volDestinations[splitVol[1]] = true
} }
} }
@ -421,6 +425,19 @@ func ContainerCreateToContainerCLIOpts(cc handlers.CreateContainerConfig, cgroup
} }
cliOpts.Volume = append(cliOpts.Volume, vol) cliOpts.Volume = append(cliOpts.Volume, vol)
} }
// Make mount points for compat volumes
for vol := range volSources {
// This might be a named volume.
// Assume it is if it's not an absolute path.
if !filepath.IsAbs(vol) {
continue
}
if err := os.MkdirAll(vol, 0755); err != nil {
if !os.IsExist(err) {
return nil, nil, errors.Wrapf(err, "error making volume mountpoint for volume %s", vol)
}
}
}
if len(cc.HostConfig.BlkioWeightDevice) > 0 { if len(cc.HostConfig.BlkioWeightDevice) > 0 {
devices := make([]string, 0, len(cc.HostConfig.BlkioWeightDevice)) devices := make([]string, 0, len(cc.HostConfig.BlkioWeightDevice))
for _, d := range cc.HostConfig.BlkioWeightDevice { for _, d := range cc.HostConfig.BlkioWeightDevice {

2
test/apiv2/44-mounts.at
View File

@ -4,7 +4,7 @@ podman pull $IMAGE &>/dev/null
# Test various HostConfig options # Test various HostConfig options
tmpfs_name="/mytmpfs" tmpfs_name="/mytmpfs"
t POST containers/create?name=hostconfig_test '"Image":"'$IMAGE'","Cmd":["df"],"HostConfig":{"TmpFs":{"'$tmpfs_name'":"rw"}}' 201 \ t POST containers/create?name=hostconfig_test '"Image":"'$IMAGE'","Cmd":["df"],"HostConfig":{"Binds":["/tmp/doesnotexist:/test1"],"TmpFs":{"'$tmpfs_name'":"rw"}}' 201 \
.Id~[0-9a-f]\\{64\\} .Id~[0-9a-f]\\{64\\}
cid=$(jq -r '.Id' <<<"$output") cid=$(jq -r '.Id' <<<"$output")