From 8c4da6c24796897f0bbdd0de36c5757f34f65c6e Mon Sep 17 00:00:00 2001 From: =?utf8?q?=EB=B0=95=EC=A2=85=ED=98=84/=EB=8F=99=EC=9E=91=EC=A0=9C?= =?utf8?q?=EC=96=B4Lab=28SR=29/Staff=20Engineer/=EC=82=BC=EC=84=B1?= =?utf8?q?=EC=A0=84=EC=9E=90?= Date: Tue, 3 Jul 2018 10:19:42 +0900 Subject: [PATCH] Add 'docker-configure' script (#458) This commit extracts 'docker-configure' script from 'docker-build' Signed-off-by: Jonghyun Park --- scripts/command/docker-build | 6 ------ scripts/command/docker-configure | 10 ++++++++++ 2 files changed, 10 insertions(+), 6 deletions(-) create mode 100644 scripts/command/docker-configure diff --git a/scripts/command/docker-build b/scripts/command/docker-build index 1961c25..6bcc610 100644 --- a/scripts/command/docker-build +++ b/scripts/command/docker-build @@ -11,12 +11,6 @@ if [ "$DOCKER_INTERACTIVE" ]; then BUILD_RESULT=$? else if [[ ${BUILD_RESULT} -eq 0 ]]; then - CMD="./nncc configure" - docker run $DOCKER_RUN_OPTS $DOCKER_ENV_VARS $DOCKER_VOLUMES $DOCKER_IMAGE_NAME $CMD - BUILD_RESULT=$? - fi - - if [[ ${BUILD_RESULT} -eq 0 ]]; then CMD="./nncc build -j$(nproc)" docker run $DOCKER_RUN_OPTS $DOCKER_ENV_VARS $DOCKER_VOLUMES $DOCKER_IMAGE_NAME $CMD BUILD_RESULT=$? diff --git a/scripts/command/docker-configure b/scripts/command/docker-configure new file mode 100644 index 0000000..9329f54 --- /dev/null +++ b/scripts/command/docker-configure @@ -0,0 +1,10 @@ +#!/bin/bash + +source "${NNCC_SCRIPT_PATH}/docker.configuration" + +docker run $DOCKER_RUN_OPTS $DOCKER_ENV_VARS $DOCKER_VOLUMES $DOCKER_IMAGE_NAME /bin/bash nncc configure "$@" +EXITCODE=$? + +docker_cleanup + +exit $EXITCODE -- 2.7.4