1 files changed, 8 insertions, 28 deletions
diff --git a/scripts/command/docker_run_test.sh b/scripts/command/docker_run_test.sh
index 75edd3428..f6605b144 100755
--- a/scripts/command/docker_run_test.sh
+++ b/scripts/command/docker_run_test.sh
@@ -1,29 +1,17 @@
 #!/bin/bash
 
-# default DOCKER_IMAGE_NAME=nnfw_docker
-DOCKER_IMAGE_NAME=${DOCKER_IMAGE_NAME:-nnfw_docker}
-echo "Using docker image $DOCKER_IMAGE_NAME"
+SCRIPT_ROOT="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 
-if [ -z "`docker images | grep $DOCKER_IMAGE_NAME`" ]; then
-    echo "Need docker image!"
-    exit 1
-fi
-
-HOST_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )/../.." && pwd )"
-
-DOCKER_PATH=/home/npuci/nnfw
+# DOCKER_HOME and DOCKER_ENV_VARS
+source $SCRIPT_ROOT/nnfw_docker
 
-export GIT_SSL_NO_VERIFY=1
+HOST_HOME=$SCRIPT_ROOT/../..
 
 DOCKER_VOLUMES=" -v /dev/null:/dev/raw1394"
-DOCKER_VOLUMES+=" -v $HOST_PATH:$DOCKER_PATH"
-
-DOCKER_ENV_VARS+=" -e http_proxy"
-DOCKER_ENV_VARS+=" -e no_proxy"
-DOCKER_ENV_VARS+=" -e GIT_SSL_NO_VERIFY"
+DOCKER_VOLUMES+=" -v $HOST_HOME:$DOCKER_HOME"
 
 DOCKER_RUN_OPTS="--rm"
-DOCKER_RUN_OPTS+=" -w $DOCKER_PATH"
+DOCKER_RUN_OPTS+=" -w $DOCKER_HOME"
 
 CMD="make install"
 
@@ -36,15 +24,7 @@ docker run $DOCKER_RUN_OPTS $DOCKER_ENV_VARS $DOCKER_VOLUMES $DOCKER_IMAGE_NAME
 
 BUILD_RESULT=$?
 
-# Newly created files during above docker run can have different ownership.
-# This may cause some problems, for example, some jenkins slaves or developers
-# can't remove built files due to lack of permission.
-# To address this issue, let's change owner of all files
-# in NPU_Compiler to owner of NPU_Compiler.
-NPU_COMPILER_OWNER_UID=$(stat -c "%u" $HOST_PATH)
-NPU_COMPILER_OWNER_GID=$(stat -c "%g" $HOST_PATH)
-
-CMD="chown -R $NPU_COMPILER_OWNER_UID:$NPU_COMPILER_OWNER_GID $DOCKER_PATH"
-docker run $DOCKER_RUN_OPTS $DOCKER_ENV_VARS $DOCKER_VOLUMES $DOCKER_IMAGE_NAME $CMD
+source $SCRIPT_ROOT/../docker_helper
+restore_ownership $HOST_HOME $DOCKER_HOME
 
 exit $BUILD_RESULT