diff --git a/components/engine/Makefile b/components/engine/Makefile index 3de6318544..ebca5b1b02 100644 --- a/components/engine/Makefile +++ b/components/engine/Makefile @@ -43,6 +43,7 @@ DOCKER_ENVS := \ -e DOCKER_REMAP_ROOT \ -e DOCKER_STORAGE_OPTS \ -e DOCKER_USERLANDPROXY \ + -e DOCKERD_ARGS \ -e TEST_INTEGRATION_DIR \ -e TESTDIRS \ -e TESTFLAGS \ diff --git a/components/engine/hack/make/run b/components/engine/hack/make/run index 366fea6f44..3254280260 100644 --- a/components/engine/hack/make/run +++ b/components/engine/hack/make/run @@ -28,9 +28,9 @@ if [ -n "$DOCKER_PORT" ]; then listen_port="${ports[-1]}" fi -extra_params="" +extra_params="$DOCKERD_ARGS" if [ "$DOCKER_REMAP_ROOT" ]; then - extra_params="--userns-remap $DOCKER_REMAP_ROOT" + extra_params="$extra_params --userns-remap $DOCKER_REMAP_ROOT" fi args="--debug \