kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Update integration test userns support with flag name change

Browse source 
`--root` is now `--userns-remap`

Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
This commit is contained in:
Phil Estes 2015-10-09 20:52:45 -04:00
parent ea3afdad61
commit a85e6a4d4a
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
hack/make/.integration-daemon-start
View file

@ -29,7 +29,7 @@ fi
# example usage: DOCKER_STORAGE_OPTS="dm.basesize=20G,dm.loopdatasize=200G" # example usage: DOCKER_STORAGE_OPTS="dm.basesize=20G,dm.loopdatasize=200G"
extra_params="" extra_params=""
if [ "$DOCKER_REMAP_ROOT" ]; then if [ "$DOCKER_REMAP_ROOT" ]; then
extra_params="--root $DOCKER_REMAP_ROOT" extra_params="--userns-remap $DOCKER_REMAP_ROOT"
fi fi
if [ -z "$DOCKER_TEST_HOST" ]; then if [ -z "$DOCKER_TEST_HOST" ]; then

2
integration-cli/docker_utils.go
View file

@ -108,7 +108,7 @@ func (d *Daemon) Start(arg ...string) error {
) )
if root := os.Getenv("DOCKER_REMAP_ROOT"); root != "" { if root := os.Getenv("DOCKER_REMAP_ROOT"); root != "" {
args = append(args, []string{"--root", root}...) args = append(args, []string{"--userns-remap", root}...)
} }
// If we don't explicitly set the log-level or debug flag(-D) then // If we don't explicitly set the log-level or debug flag(-D) then