From de438df3a8163e6ffb8786e4d96802c19e0af0c7 Mon Sep 17 00:00:00 2001 From: Vincent Demeester Date: Fri, 1 Jun 2018 19:19:20 +0200 Subject: [PATCH] Allow to add any args when doing a make run `make DOCKERD_ARGS=--init binary run` should start the daemon with `--init` as flags (with any other "automagically" added ones). Signed-off-by: Vincent Demeester Upstream-commit: d2af0d96e3fbdfec340cb707b795b863411b00e1 Component: engine --- components/engine/Makefile | 1 + components/engine/hack/make/run | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) 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 \