From fd77b5d48782e67306c3763dc1908f0fb342c51d Mon Sep 17 00:00:00 2001
From: Guo Ruijing <ruijing.guo@intel.com>
Date: Mon, 20 Jun 2016 21:17:32 +0000
Subject: [PATCH] Fix docker volume issue in ovs build

Change-Id: I9c87cb6e204b80df72020cac0297c27f603fb109
Signed-off-by: Guo Ruijing <ruijing.guo@intel.com>
---
 pre_build_hook | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/pre_build_hook b/pre_build_hook
index c11860a..63cf7b4 100755
--- a/pre_build_hook
+++ b/pre_build_hook
@@ -13,15 +13,18 @@ function build_pkg {
       cd ${DIR}/ovs_build
       sudo docker build -t ovs_build .
 
-      rm -rf ${DIR}/deb;  mkdir -p ${DIR}/deb; chmod 777 ${DIR}/deb; cd ${DIR}/deb
-      sudo docker run -v ${DIR}/deb:/deb -t  ovs_build /ovs_build/build-ovs-dpdk.sh
-      tar czvf ../repositories/ubuntu/ovs-dpdk.tar.gz .; cd ..
+      DEB_DIR=${DIR}/deb-ovs-dpdk
+      rm -rf ${DEB_DIR};  mkdir -p ${DEB_DIR}; chmod 777 ${DEB_DIR};
+      sudo docker run -v ${DEB_DIR}:/deb -t  ovs_build /ovs_build/build-ovs-dpdk.sh
+      cd ${DEB_DIR}; tar czvf ../repositories/ubuntu/ovs-dpdk.tar.gz .;
+      cd ..; rm -rf ${DEB_DIR}
 
-      rm -rf ${DIR}/deb;  mkdir -p ${DIR}/deb; chmod 777 ${DIR}/deb; cd ${DIR}/deb
-      sudo docker run -v ${DIR}/ovs-nsh:/deb -t  ovs_build /ovs_build/build-ovs-nsh-dpdk.sh
-      tar czvf ../repositories/ubuntu/ovs-nsh-dpdk.tar.gz .; cd ..
+      DEB_DIR=${DIR}/deb-ovs-nsh-dpdk
+      rm -rf ${DEB_DIR};  mkdir -p ${DEB_DIR}; chmod 777 ${DEB_DIR};
+      sudo docker run -v ${DEB_DIR}:/deb -t  ovs_build /ovs_build/build-ovs-nsh-dpdk.sh
+      cd ${DEB_DIR}; tar czvf ../repositories/ubuntu/ovs-nsh-dpdk.tar.gz .;
+      cd ..; rm -rf ${DEB_DIR}
 
-      rm -rf ${DIR}/deb;
       ;;
     *) echo "Not supported system"; exit 1;;
   esac