From ab16c8266c416ac182be992abc0317fa033ab2ed Mon Sep 17 00:00:00 2001
From: =?utf8?q?=EC=B5=9C=ED=98=95=EA=B7=9C/=EB=8F=99=EC=9E=91=EC=A0=9C?=
 =?utf8?q?=EC=96=B4Lab=28SR=29/Senior=20Engineer/=EC=82=BC=EC=84=B1?=
 =?utf8?q?=EC=A0=84=EC=9E=90?= <hk0110.choi@samsung.com>
Date: Thu, 10 May 2018 16:10:09 +0900
Subject: [PATCH] Extract common code of docker image (#1150)

- Introduce nnfw_docker by extracting common code related to docker image nnfw_docker
- Use nnfw_docker in docker_run_test.sh to see it's working

Signed-off-by: Hyung-Kyu Choi <hk0110.choi@samsung.com>
---
 scripts/command/docker_run_test.sh | 23 +++++------------------
 scripts/command/nnfw_docker        | 14 ++++++++++++++
 2 files changed, 19 insertions(+), 18 deletions(-)
 create mode 100644 scripts/command/nnfw_docker

diff --git a/scripts/command/docker_run_test.sh b/scripts/command/docker_run_test.sh
index f74672e..4584476 100755
--- a/scripts/command/docker_run_test.sh
+++ b/scripts/command/docker_run_test.sh
@@ -2,29 +2,16 @@
 
 SCRIPT_ROOT="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 
-# default DOCKER_IMAGE_NAME=nnfw_docker defined in common.sh
-source $SCRIPT_ROOT/common.sh
-echo "Using docker image $DOCKER_IMAGE_NAME"
-
-if [ -z "`docker images | grep $DOCKER_IMAGE_NAME`" ]; then
-    echo "Need docker image!"
-    exit 1
-fi
+# DOCKER_HOME and DOCKER_ENV_VARS
+source $SCRIPT_ROOT/nnfw_docker
 
 HOST_PATH=$SCRIPT_ROOT/../..
-DOCKER_PATH=/home/npuci/nnfw
-
-export GIT_SSL_NO_VERIFY=1
 
 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_PATH:$DOCKER_HOME"
 
 DOCKER_RUN_OPTS="--rm"
-DOCKER_RUN_OPTS+=" -w $DOCKER_PATH"
+DOCKER_RUN_OPTS+=" -w $DOCKER_HOME"
 
 CMD="make install"
 
@@ -45,7 +32,7 @@ BUILD_RESULT=$?
 NNFW_OWNER_UID=$(stat -c "%u" $HOST_PATH)
 NNFW_OWNER_GID=$(stat -c "%g" $HOST_PATH)
 
-CMD="chown -R $NNFW_OWNER_UID:$NNFW_OWNER_GID $DOCKER_PATH"
+CMD="chown -R $NNFW_OWNER_UID:$NNFW_OWNER_GID $DOCKER_HOME"
 docker run $DOCKER_RUN_OPTS $DOCKER_ENV_VARS $DOCKER_VOLUMES $DOCKER_IMAGE_NAME $CMD
 
 exit $BUILD_RESULT
diff --git a/scripts/command/nnfw_docker b/scripts/command/nnfw_docker
new file mode 100644
index 0000000..2111241
--- /dev/null
+++ b/scripts/command/nnfw_docker
@@ -0,0 +1,14 @@
+DOCKER_IMAGE_NAME=${DOCKER_IMAGE_NAME:-nnfw_docker}
+
+echo "Using docker image $DOCKER_IMAGE_NAME"
+if [[ "$(docker images -q $DOCKER_IMAGE_NAME 2> /dev/null)" == "" ]]; then
+    echo "Need docker image: $DOCKER_IMAGE_NAME"
+    exit 1
+fi
+
+DOCKER_HOME=/home/nnfw
+
+GIT_SSL_NO_VERIFY=1
+DOCKER_ENV_VARS+=" -e http_proxy"
+DOCKER_ENV_VARS+=" -e no_proxy"
+DOCKER_ENV_VARS+=" -e GIT_SSL_NO_VERIFY"
-- 
2.7.4