opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-26 12:56:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #19902 from giuseppe/fix-pod-run-with-mounts

Browse Source 
pod: fix duplicate volumes from containers.conf
This commit is contained in:
Daniel J Walsh
2023-09-09 10:09:25 -04:00
committed by GitHub
parent 7bf9f302a3 fbbad04398
commit 745201ea23
2 changed files with 22 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/podman/pods/create.go
View File

@ -62,6 +62,10 @@ func init() {
flags := createCommand.Flags() flags := createCommand.Flags()
flags.SetInterspersed(false) flags.SetInterspersed(false)
common.DefineCreateDefaults(&infraOptions) common.DefineCreateDefaults(&infraOptions)
// these settings are not applicable to pod create since they are per-container
// and they will end up being duplicated for each container in the pod.
infraOptions.Volume = nil
infraOptions.Mount = nil
common.DefineCreateFlags(createCommand, &infraOptions, entities.InfraMode) common.DefineCreateFlags(createCommand, &infraOptions, entities.InfraMode)
common.DefineNetFlags(createCommand) common.DefineNetFlags(createCommand)

18
test/system/200-pod.bats
View File

@ -71,6 +71,24 @@ function teardown() {
} }
@test "podman pod create - custom volumes" {
skip_if_remote "CONTAINERS_CONF_OVERRIDE only affects server side"
image="i.do/not/exist:image"
tmpdir=$PODMAN_TMPDIR/pod-test
mkdir -p $tmpdir
containersconf=$tmpdir/containers.conf
cat >$containersconf <<EOF
[containers]
volumes = ["/tmp:/foobar"]
EOF
CONTAINERS_CONF_OVERRIDE=$containersconf run_podman pod create
podid="$output"
CONTAINERS_CONF_OVERRIDE=$containersconf run_podman create --pod $podid $IMAGE grep foobar /proc/mounts
}
@test "podman pod create - custom infra image" { @test "podman pod create - custom infra image" {
skip_if_remote "CONTAINERS_CONF_OVERRIDE only affects server side" skip_if_remote "CONTAINERS_CONF_OVERRIDE only affects server side"
image="i.do/not/exist:image" image="i.do/not/exist:image"