diff options
| author | 박종현/동작제어Lab(SR)/Staff Engineer/삼성전자 <jh1302.park@samsung.com> | 2018-07-24 17:40:30 +0900 |
|---|---|---|
| committer | GitHub Enterprise <noreply-CODE@samsung.com> | 2018-07-24 17:40:30 +0900 |
| commit | ca4536ffa5f9fbd8ecddec2424a6f9a7eb68d830 (patch) | |
| tree | a7e8bbd2fa253ba5fbf13464c4df63c59aae369b /scripts | |
| parent | e483747877944b0a80955394144f7b945febcbd5 (diff) | |
| download | nnfw-ca4536ffa5f9fbd8ecddec2424a6f9a7eb68d830.tar.gz nnfw-ca4536ffa5f9fbd8ecddec2424a6f9a7eb68d830.tar.bz2 nnfw-ca4536ffa5f9fbd8ecddec2424a6f9a7eb68d830.zip | |
Unify docker commands (#761)
This commit unifies docker-configure/docker-build/docker-test commands
into docker-nncc, and updates getting started document.
Signed-off-by: Jonghyun Park <jh1302.park@samsung.com>
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/command/docker-build | 15 | ||||
| -rw-r--r-- | scripts/command/docker-configure | 10 | ||||
| -rw-r--r-- | scripts/command/docker-nncc (renamed from scripts/command/docker-test) | 2 |
3 files changed, 1 insertions, 26 deletions
diff --git a/scripts/command/docker-build b/scripts/command/docker-build deleted file mode 100644 index 2da6db104..000000000 --- a/scripts/command/docker-build +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/bash - -source "${NNCC_SCRIPT_PATH}/docker.configuration" - -BUILD_RESULT=0 - - 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=$? - fi - -docker_cleanup - -exit $BUILD_RESULT diff --git a/scripts/command/docker-configure b/scripts/command/docker-configure deleted file mode 100644 index 9329f549b..000000000 --- a/scripts/command/docker-configure +++ /dev/null @@ -1,10 +0,0 @@ -#!/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 diff --git a/scripts/command/docker-test b/scripts/command/docker-nncc index cf579e7cb..143a280ea 100644 --- a/scripts/command/docker-test +++ b/scripts/command/docker-nncc @@ -2,7 +2,7 @@ source "${NNCC_SCRIPT_PATH}/docker.configuration" -docker run $DOCKER_RUN_OPTS $DOCKER_ENV_VARS $DOCKER_VOLUMES $DOCKER_IMAGE_NAME /bin/bash nncc test "$@" +docker run $DOCKER_RUN_OPTS $DOCKER_ENV_VARS $DOCKER_VOLUMES $DOCKER_IMAGE_NAME ./nncc "$@" EXITCODE=$? docker_cleanup |