From 778b054900496daefb7c5fa00ef0fe10fcb28316 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: Thu, 3 Jan 2019 19:16:13 +0900 Subject: [PATCH] Update docker builder script (#4141) - Fix to handle multiple docker image build argument - Set default image name Signed-off-by: Hyeongseok Oh --- scripts/command/build-docker | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/scripts/command/build-docker b/scripts/command/build-docker index 69e5587..2da70be 100644 --- a/scripts/command/build-docker +++ b/scripts/command/build-docker @@ -13,6 +13,8 @@ function Usage() DOCKER_FILE_RPATH="docker/Dockerfile" DOCKER_BUILD_ARGS=() +# Handle argument for this script +# Set default docker image name, tag for i in "$@" do case $i in @@ -21,8 +23,22 @@ do exit 1 ;; --tizen) + DOCKER_IMAGE_NAME=${DOCKER_IMAGE_NAME:-nnfw_docker_tizen} DOCKER_FILE_RPATH="docker/Dockerfile_tizen" ;; + esac +done +source "$NNFW_SCRIPT_PATH/config/image_name.configuration" +DOCKER_BUILD_ARGS+="-t ${DOCKER_IMAGE_NAME}" + +# Argument for docker build commands +for i in "$@" +do + case $i in + -h|--help|help) + --tizen) + # Already handled argument + ;; *) DOCKER_BUILD_ARGS+=($1) ;; @@ -30,9 +46,7 @@ do shift done -source "$NNFW_SCRIPT_PATH/config/image_name.configuration" - docker build --build-arg http_proxy="$http_proxy" \ --build-arg https_proxy="$https_proxy" \ - $DOCKER_BUILD_ARGS \ + ${DOCKER_BUILD_ARGS[@]} \ - < $NNFW_SCRIPT_PATH/$DOCKER_FILE_RPATH -- 2.7.4