Skip to content

Commit

Permalink
Merge pull request #12433 from matejvasek/fix-mount-parsing
Browse files Browse the repository at this point in the history
fix: parsing of HostConfig.Mounts for container create
  • Loading branch information
openshift-merge-robot authored Nov 29, 2021
2 parents c234c20 + 697ff21 commit 6052914
Show file tree
Hide file tree
Showing 2 changed files with 27 additions and 2 deletions.
4 changes: 3 additions & 1 deletion cmd/podman/common/create_opts.go
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,9 @@ func ContainerCreateToContainerCLIOpts(cc handlers.CreateContainerConfig, rtc *c
addField(&builder, "type", string(m.Type))
addField(&builder, "source", m.Source)
addField(&builder, "target", m.Target)
addField(&builder, "ro", strconv.FormatBool(m.ReadOnly))
if m.ReadOnly {
addField(&builder, "ro", "true")
}
addField(&builder, "consistency", string(m.Consistency))
// Map any specialized mount options that intersect between *Options and cli options
switch m.Type {
Expand Down
25 changes: 24 additions & 1 deletion test/python/docker/compat/test_containers.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,13 @@
import sys
import time
import unittest
from typing import IO, Optional
from typing import IO, Optional, List

from docker import DockerClient, errors
from docker.models.containers import Container
from docker.models.images import Image
from docker.models.volumes import Volume
from docker.types import Mount

from test.python.docker import Podman
from test.python.docker.compat import common, constant
Expand Down Expand Up @@ -277,3 +278,25 @@ def test_non_existant_workdir(self):
ctr.start()
ret, out = ctr.exec_run(["stat", "/workspace/scratch/test"])
self.assertEqual(ret, 0, "Working directory created if it doesn't exist")

def test_mount_rw_by_default(self):
ctr: Optional[Container] = None
vol: Optional[Volume] = None
try:
vol = self.client.volumes.create("test-volume")
ctr = self.client.containers.create(image="alpine",
detach=True,
command="top",
mounts=[Mount(target="/vol-mnt",
source="test-volume",
type='volume',
read_only=False)])
ctr_inspect = self.client.api.inspect_container(ctr.id)
binds: List[str] = ctr_inspect["HostConfig"]["Binds"]
self.assertEqual(len(binds), 1)
self.assertEqual(binds[0], 'test-volume:/vol-mnt:rw,rprivate,nosuid,nodev,rbind')
finally:
if ctr is not None:
ctr.remove()
if vol is not None:
vol.remove(force=True)

0 comments on commit 6052914

Please sign in to comment.