diff options
Diffstat (limited to 'scripts/command/docker_run_test.sh')
-rwxr-xr-x | scripts/command/docker_run_test.sh | 34 |
1 files changed, 11 insertions, 23 deletions
diff --git a/scripts/command/docker_run_test.sh b/scripts/command/docker_run_test.sh index f6605b144..dadd19f8a 100755 --- a/scripts/command/docker_run_test.sh +++ b/scripts/command/docker_run_test.sh @@ -1,30 +1,18 @@ #!/bin/bash -SCRIPT_ROOT="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +export DOCKER_ENV_VARS +export DOCKER_VOLUMES -# DOCKER_HOME and DOCKER_ENV_VARS -source $SCRIPT_ROOT/nnfw_docker +pushd $NNFW_PROJECT_PATH -HOST_HOME=$SCRIPT_ROOT/../.. - -DOCKER_VOLUMES=" -v /dev/null:/dev/raw1394" -DOCKER_VOLUMES+=" -v $HOST_HOME:$DOCKER_HOME" - -DOCKER_RUN_OPTS="--rm" -DOCKER_RUN_OPTS+=" -w $DOCKER_HOME" - -CMD="make install" - -if [ "$DOCKER_INTERACTIVE" ]; then - DOCKER_RUN_OPTS+=" -it" - CMD="/bin/bash" +if [ -n "$DOCKER_INTERACTIVE" ]; then + source run docker-shell +else + CMD="make install" + source run docker-run-user bash -c "${CMD}" fi +EXITCODE=$? -docker run $DOCKER_RUN_OPTS $DOCKER_ENV_VARS $DOCKER_VOLUMES $DOCKER_IMAGE_NAME $CMD - -BUILD_RESULT=$? - -source $SCRIPT_ROOT/../docker_helper -restore_ownership $HOST_HOME $DOCKER_HOME +popd -exit $BUILD_RESULT +exit $EXITCODE |