From: 오형석/동작제어Lab(SR)/Staff Engineer/삼성전자 Date: Thu, 15 Nov 2018 04:03:19 +0000 (+0900) Subject: Support docker run as non-root user (#3592) X-Git-Tag: 0.3~411 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3067e907d8c1da4335aaa1c5bf15f9105e951b7e;p=platform%2Fcore%2Fml%2Fnnfw.git Support docker run as non-root user (#3592) Run non-root anomymous user: same userid with host user Used on arm cross build and tizen build Signed-off-by: Hyeongseok Oh --- diff --git a/scripts/command/docker-run-user b/scripts/command/docker-run-user new file mode 100644 index 0000000..448fd31 --- /dev/null +++ b/scripts/command/docker-run-user @@ -0,0 +1,10 @@ +#!/bin/bash + +source "${NNFW_SCRIPT_PATH}/docker.configuration" + +DOCKER_RUN_OPTS+=" -u $(id -u):$(id -g)" + +docker run $DOCKER_RUN_OPTS $DOCKER_ENV_VARS $DOCKER_VOLUMES $DOCKER_IMAGE_NAME "$@" +EXITCODE=$? + +exit $EXITCODE diff --git a/scripts/command/docker_build_cross_arm_ubuntu.sh b/scripts/command/docker_build_cross_arm_ubuntu.sh index 925891a..29f2726 100755 --- a/scripts/command/docker_build_cross_arm_ubuntu.sh +++ b/scripts/command/docker_build_cross_arm_ubuntu.sh @@ -21,7 +21,7 @@ if [ -n "$DOCKER_INTERACTIVE" ]; then source run docker-shell else CMD="export BENCHMARK_ACL_BUILD=1 && make acl && make && make install && make build_test_suite" - source run docker-run bash -c "${CMD}" + source run docker-run-user bash -c "${CMD}" fi EXITCODE=$? diff --git a/scripts/command/docker_build_tizen_cross.sh b/scripts/command/docker_build_tizen_cross.sh index 3a55ce4..6d750b1 100755 --- a/scripts/command/docker_build_tizen_cross.sh +++ b/scripts/command/docker_build_tizen_cross.sh @@ -19,7 +19,7 @@ export NNFW_SCRIPT_PATH pushd $NNFW_PROJECT_PATH CMD="make && make install && make build_test_suite" -source run docker-run bash -c "${CMD}" +source run docker-run-user bash -c "${CMD}" EXITCODE=$? popd