From bcd1a5196c8124f518fbd89ba9cfa9a75112bf54 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?= Date: Fri, 11 May 2018 09:42:13 +0900 Subject: [PATCH] Introduce nnfw_docker_tizen and use it (#1161) - Introduce nnfw_docker_tizen by extracting code related to nnfw_docker_tizen - Use it in docker_gbs_build.sh Signed-off-by: Hyung-Kyu Choi --- scripts/command/docker_gbs_build.sh | 10 +++++++--- scripts/command/nnfw_docker_tizen | 14 ++++++++++++++ 2 files changed, 21 insertions(+), 3 deletions(-) create mode 100644 scripts/command/nnfw_docker_tizen diff --git a/scripts/command/docker_gbs_build.sh b/scripts/command/docker_gbs_build.sh index 03979e6..2ea989d 100755 --- a/scripts/command/docker_gbs_build.sh +++ b/scripts/command/docker_gbs_build.sh @@ -1,8 +1,12 @@ #!/bin/bash -MY_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" -NNFW_ROOT=$MY_PATH/../.. -DOCKER_NNFW_HOME=/home/nnfw +SCRIPT_ROOT="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" + +# DOCKER_HOME and DOCKER_ENV_VARS +source $SCRIPT_ROOT/nnfw_docker_tizen + +NNFW_ROOT=$SCRIPT_ROOT/../.. +DOCKER_NNFW_HOME=${DOCKER_HOME} DOCKER_RPM_HOME=/home/rpm if [ "${GBS_RPM_DIR}" == "" ]; diff --git a/scripts/command/nnfw_docker_tizen b/scripts/command/nnfw_docker_tizen new file mode 100644 index 0000000..f2fae9c --- /dev/null +++ b/scripts/command/nnfw_docker_tizen @@ -0,0 +1,14 @@ +DOCKER_IMAGE_NAME=${DOCKER_IMAGE_NAME:-nnfw_docker_tizen} + +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