Update docker-shell and configuration (#3324)

* Update docker-shell and configuration

Update docker-shell

- Use docker.configuration

Update docker.configuration

- Change default docker image name
- Fix tab to space
- Fix setting DOCKER_VOLUMES variable
- Enable using environment file

Signed-off-by: Hyeongseok Oh <hseok82.oh@samsung.com>
* Update environment variable setting

Remove unused environment setting and add download server setting

diff --git a/scripts/command/docker-shell b/scripts/command/docker-shell
index f4834f2..8549d20 100755 (executable)
--- a/scripts/command/docker-shell
+++ b/scripts/command/docker-shell
@@ -1,24 +1,10 @@
 #!/bin/bash
 
-SCRIPT_ROOT="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+source "${NNFW_SCRIPT_PATH}/docker.configuration"
 
-source $SCRIPT_ROOT/common.sh
+docker run $DOCKER_RUN_OPTS $DOCKER_ENV_VARS $DOCKER_VOLUMES $DOCKER_IMAGE_NAME "/bin/bash"
+EXITCODE=$?
 
-HOST_HOME=$SCRIPT_ROOT/../..
-DOCKER_HOME=/home
+docker_cleanup
 
-GIT_SSL_NO_VERIFY=1
-
-DOCKER_VOLUMES+=" -v $HOST_HOME:$DOCKER_HOME"
-
-DOCKER_ENV_VARS+=" -e http_proxy"
-DOCKER_ENV_VARS+=" -e no_proxy"
-DOCKER_ENV_VARS+=" -e GIT_SSL_NO_VERIFY"
-
-DOCKER_RUN_OPTS="--rm"
-DOCKER_RUN_OPTS+=" -w $DOCKER_HOME"
-DOCKER_RUN_OPTS+=" -it"
-
-CMD="/bin/bash"
-
-docker run $DOCKER_RUN_OPTS $DOCKER_ENV_VARS $DOCKER_VOLUMES $DOCKER_IMAGE_NAME $CMD
+exit $EXITCODE

diff --git a/scripts/docker.configuration b/scripts/docker.configuration
index 29da27c..c95996b 100644 (file)
--- a/scripts/docker.configuration
+++ b/scripts/docker.configuration
@@ -1,9 +1,9 @@
-DOCKER_IMAGE_NAME=${DOCKER_IMAGE_NAME:-nnfw}
+DOCKER_IMAGE_NAME=${DOCKER_IMAGE_NAME:-nnfw_docker}
 echo "Using docker image $DOCKER_IMAGE_NAME"
 
 if [ -z "`docker images | grep $DOCKER_IMAGE_NAME`" ]; then
-    echo "Need docker image!"
-    exit 1
+  echo "Need docker image!"
+  exit 1
 fi
 
 HOST_PATH="$NNFW_PROJECT_PATH"
@@ -11,19 +11,16 @@ DOCKER_PATH="$NNFW_PROJECT_PATH"
 
 export GIT_SSL_NO_VERIFY=1
 
-DOCKER_VOLUMES=" -v $HOST_PATH:$DOCKER_PATH"
+DOCKER_VOLUMES+=" -v $HOST_PATH:$DOCKER_PATH"
+
+if [[ ! -z $ENV_FILE ]]; then
+  DOCKER_ENV_VARS+=" --env-file ${ENV_FILE} "
+fi
 
 DOCKER_ENV_VARS+=" -e http_proxy"
 DOCKER_ENV_VARS+=" -e no_proxy"
 DOCKER_ENV_VARS+=" -e GIT_SSL_NO_VERIFY"
-DOCKER_ENV_VARS+=" -e ARMCOMPUTE_URL"
-DOCKER_ENV_VARS+=" -e EIGEN_URL"
-DOCKER_ENV_VARS+=" -e FARMHASH_URL"
-DOCKER_ENV_VARS+=" -e FLATBUFFERS_URL"
-DOCKER_ENV_VARS+=" -e GEMMLOWP_URL"
-DOCKER_ENV_VARS+=" -e GTEST_URL"
-DOCKER_ENV_VARS+=" -e NEON2SSE_URL"
-DOCKER_ENV_VARS+=" -e TENSORFLOW_URL"
+DOCKER_ENV_VARS+=" -e EXTERNAL_DOWNLOAD_SERVER"
 
 DOCKER_RUN_OPTS="${DOCKER_OPTS}"
 DOCKER_RUN_OPTS+=" --rm"