Browse code
Update integration test userns support with flag name change
`--root` is now `--userns-remap`
Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
Phil Estes authored on 2015/10/10 09:52:45Showing 2 changed files
| ... | ... |
@@ -29,7 +29,7 @@ fi |
| 29 | 29 |
# example usage: DOCKER_STORAGE_OPTS="dm.basesize=20G,dm.loopdatasize=200G" |
| 30 | 30 |
extra_params="" |
| 31 | 31 |
if [ "$DOCKER_REMAP_ROOT" ]; then |
| 32 |
- extra_params="--root $DOCKER_REMAP_ROOT" |
|
| 32 |
+ extra_params="--userns-remap $DOCKER_REMAP_ROOT" |
|
| 33 | 33 |
fi |
| 34 | 34 |
|
| 35 | 35 |
if [ -z "$DOCKER_TEST_HOST" ]; then |
| ... | ... |
@@ -108,7 +108,7 @@ func (d *Daemon) Start(arg ...string) error {
|
| 108 | 108 |
) |
| 109 | 109 |
|
| 110 | 110 |
if root := os.Getenv("DOCKER_REMAP_ROOT"); root != "" {
|
| 111 |
- args = append(args, []string{"--root", root}...)
|
|
| 111 |
+ args = append(args, []string{"--userns-remap", root}...)
|
|
| 112 | 112 |
} |
| 113 | 113 |
|
| 114 | 114 |
// If we don't explicitly set the log-level or debug flag(-D) then |