kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Merge pull request #37190 from vdemeester/allow-make-run-with-args

Browse source 
Allow to add any args when doing a make run
This commit is contained in:
Akihiro Suda 2018-06-03 03:42:02 +09:00 • committed by GitHub
commit 641e2c01cc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
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 \