Update default docker image name (#6876)

Update default docker image name to nnas
Update checking image existance to check docker name & tag
Remove unused image_name.configuration file

Signed-off-by: Hyeongseok Oh <hseok82.oh@samsung.com>

diff --git a/infra/nncc/config/docker.configuration b/infra/nncc/config/docker.configuration
index a22ea05..7078585 100644 (file)
--- a/infra/nncc/config/docker.configuration
+++ b/infra/nncc/config/docker.configuration
@@ -1,9 +1,9 @@
-DOCKER_IMAGE_NAME=${DOCKER_IMAGE_NAME:-nncc}
-echo "Using docker image $DOCKER_IMAGE_NAME"
+DOCKER_IMAGE_NAME=${DOCKER_IMAGE_NAME:-nnas}
+echo "Using docker image ${DOCKER_IMAGE_NAME}"
 
-if [ -z "`docker images | grep $DOCKER_IMAGE_NAME`" ]; then
-    echo "Need docker image!"
-    exit 1
+if [ -z "`docker images ${DOCKER_IMAGE_NAME}`" ]; then
+  echo "Need docker image!"
+  exit 1
 fi
 
 HOST_PATH="$NNCC_PROJECT_PATH"

diff --git a/infra/nnfw/config/docker.configuration b/infra/nnfw/config/docker.configuration
index f57ab64..b7e9ad3 100644 (file)
--- a/infra/nnfw/config/docker.configuration
+++ b/infra/nnfw/config/docker.configuration
@@ -1,10 +1,9 @@
 #!/bin/bash
 
-import "image_name.configuration"
+DOCKER_IMAGE_NAME=${DOCKER_IMAGE_NAME:-nnas}
+echo "Using docker image ${DOCKER_IMAGE_NAME}"
 
-echo "Using docker image $DOCKER_IMAGE_NAME"
-
-if [ -z "`docker images | grep $DOCKER_IMAGE_NAME`" ]; then
+if [ -z "`docker images ${DOCKER_IMAGE_NAME}`" ]; then
   echo "Need docker image!"
   exit 1
 fi

diff --git a/infra/nnfw/config/image_name.configuration b/infra/nnfw/config/image_name.configuration
deleted file mode 100644 (file)
index 507f154..0000000
--- a/infra/nnfw/config/image_name.configuration
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-
-DOCKER_IMAGE_NAME=${DOCKER_IMAGE_NAME:-nnfw_docker}