Add 'docker-configure' script (#458)
author박종현/동작제어Lab(SR)/Staff Engineer/삼성전자 <jh1302.park@samsung.com>
Tue, 3 Jul 2018 01:19:42 +0000 (10:19 +0900)
committerGitHub Enterprise <noreply-CODE@samsung.com>
Tue, 3 Jul 2018 01:19:42 +0000 (10:19 +0900)
This commit extracts 'docker-configure' script from 'docker-build'

Signed-off-by: Jonghyun Park <jh1302.park@samsung.com>
scripts/command/docker-build
scripts/command/docker-configure [new file with mode: 0644]

index 1961c25..6bcc610 100644 (file)
@@ -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 (file)
index 0000000..9329f54
--- /dev/null
@@ -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