1. docker
  2. Commit d2af0d96e3fbdfec340cb707b795b863411b00e1
Browse code

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 <vincent@sbr.pm>

Vincent Demeester authored on 2018/06/02 02:19:20
Showing 2 changed files
Makefile
History View file @ d2af0d9
... ... 
@@ -43,6 +43,7 @@ DOCKER_ENVS := \
43 43 
 	-e DOCKER_REMAP_ROOT \
44 44 
 	-e DOCKER_STORAGE_OPTS \
45 45 
 	-e DOCKER_USERLANDPROXY \
46 
+	-e DOCKERD_ARGS \
46 47 
 	-e TEST_INTEGRATION_DIR \
47 48 
 	-e TESTDIRS \
48 49 
 	-e TESTFLAGS \
hack/make/run
History View file @ d2af0d9
... ... 
@@ -28,9 +28,9 @@ if [ -n "$DOCKER_PORT" ]; then
28 28 
 	listen_port="${ports[-1]}"
29 29 
 fi
30 30
31 
-extra_params=""
31 
+extra_params="$DOCKERD_ARGS"
32 32 
 if [ "$DOCKER_REMAP_ROOT" ]; then
33 
-	extra_params="--userns-remap $DOCKER_REMAP_ROOT"
33 
+	extra_params="$extra_params --userns-remap $DOCKER_REMAP_ROOT"
34 34 
 fi
35 35
36 36 
 args="--debug \