beenull/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Allow to add any args when doing a make run

Browse source 
`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>
This commit is contained in:
Vincent Demeester 2018-06-01 19:19:20 +02:00
parent 71cd53e4a1
commit d2af0d96e3
No known key found for this signature in database
GPG key ID: 083CC6FD6EB699A3
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Makefile
View file

@ -43,6 +43,7 @@ DOCKER_ENVS := \
-e DOCKER_REMAP_ROOT \ -e DOCKER_REMAP_ROOT \
-e DOCKER_STORAGE_OPTS \ -e DOCKER_STORAGE_OPTS \
-e DOCKER_USERLANDPROXY \ -e DOCKER_USERLANDPROXY \
-e DOCKERD_ARGS \
-e TEST_INTEGRATION_DIR \ -e TEST_INTEGRATION_DIR \
-e TESTDIRS \ -e TESTDIRS \
-e TESTFLAGS \ -e TESTFLAGS \

4
hack/make/run
View file

@ -28,9 +28,9 @@ if [ -n "$DOCKER_PORT" ]; then
listen_port="${ports[-1]}" listen_port="${ports[-1]}"
fi fi
extra_params="" extra_params="$DOCKERD_ARGS"
if [ "$DOCKER_REMAP_ROOT" ]; then if [ "$DOCKER_REMAP_ROOT" ]; then
extra_params="--userns-remap $DOCKER_REMAP_ROOT" extra_params="$extra_params --userns-remap $DOCKER_REMAP_ROOT"
fi fi
args="--debug \ args="--debug \