diff options
| author |   Julien-zte <zhang.jun3g@zte.com.cn> | 2017-03-02 21:11:17 +0800 |
|---|---|---|
| committer | Julien <zhang.jun3g@zte.com.cn> | 2017-03-07 10:03:18 +0800 |
| commit | cea3fc95422cb550a156c365e046099e413e0563 (patch) | |
| tree | 27c12c62aaaadf1d9cd4d3caa422139f7e5b379b /ci | |
| parent | 7c3c3d2a629f5bf5373d21780963a143d45e6067 (diff) | |
Fix judging condition flaw
*the judging condition var is $volumes_to_remove instead of
$containers_to_kill at line 95 in kolla-build.sh
*unify the code indent
Change-Id: Ia6722d32f98fbee938e4eb6f1be0cedd3dc38aa8
Signed-off-by: Julien <zhang.jun3g@zte.com.cn>
Signed-off-by: zhongjun <zhong.jun@zte.com.cn>
Diffstat (limited to 'ci')
| -rwxr-xr-x | ci/kolla-build.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ci/kolla-build.sh b/ci/kolla-build.sh index 53ad8c16..6b7d330d 100755 --- a/ci/kolla-build.sh +++ b/ci/kolla-build.sh @@ -92,7 +92,7 @@ function cleanup_registry_server { echo "Removing containers... $containers_to_kill" (sudo docker rm -v -f ${containers_to_kill} 2>&1) > /dev/null - if [[ ! -z "$containers_to_kill" ]]; then + if [[ ! -z "$volumes_to_remove" ]]; then echo "Removing volumes... $volumes_to_remove" (sudo docker volume rm ${volumes_to_remove} 2>&1) || true > /dev/null fi @@ -145,7 +145,7 @@ function pack_registry_data { function update_kolla_code { echo "Updating Kolla code" if [ ! -d $KOLLA_GIT_DIR ] ; then - mkdir -p $KOLLA_GIT_DIR + mkdir -p $KOLLA_GIT_DIR fi if [ ! -d $KOLLA_GIT_DIR/kolla ] ; then |