From 07772e9d5cbbd1894c0cbef60666cbd877e0cf18 Mon Sep 17 00:00:00 2001 From: =?utf8?q?=EC=98=A4=ED=98=95=EC=84=9D/On-Device=20Lab=28SR=29/Staff?= =?utf8?q?=20Engineer/=EC=82=BC=EC=84=B1=EC=A0=84=EC=9E=90?= Date: Fri, 23 Aug 2019 16:24:08 +0900 Subject: [PATCH] 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 --- infra/nncc/config/docker.configuration | 10 +++++----- infra/nnfw/config/docker.configuration | 7 +++---- infra/nnfw/config/image_name.configuration | 3 --- 3 files changed, 8 insertions(+), 12 deletions(-) delete mode 100644 infra/nnfw/config/image_name.configuration diff --git a/infra/nncc/config/docker.configuration b/infra/nncc/config/docker.configuration index a22ea05..7078585 100644 --- 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 --- 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 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} -- 2.7.4