From 338305dd928bde2cfcaab1b133dbb72bcbc5ca08 Mon Sep 17 00:00:00 2001
From: Pavel Kotucek <pavel.kotucek@pantheon.tech>
Date: Wed, 15 May 2019 11:44:18 +0200
Subject: Docker build improvements

Additional small changes to create dev docker image.
Possibility to specify vpp version (master/release) to be used.

Change-Id: I2c3ea9df60a9b00fbd158f2d06192f23ecd3ee0b
Signed-off-by: Pavel Kotucek <pavel.kotucek@pantheon.tech>
---
 scripts/run_test.sh | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

(limited to 'scripts/run_test.sh')

diff --git a/scripts/run_test.sh b/scripts/run_test.sh
index ca6c6b6..5586c7e 100755
--- a/scripts/run_test.sh
+++ b/scripts/run_test.sh
@@ -15,6 +15,7 @@
 # limitations under the License.
 
 IMAGE="sweetcomb_img"
+IMAGE_TEST="sweetcomb_test_img"
 CONTAINER="sweetcomb_test"
 
 FIND=`docker container ls -a | grep ${CONTAINER}`
@@ -25,12 +26,19 @@ if [ -n "${FIND}" ]; then
 fi
 
 FIND=`docker images | grep ${IMAGE}`
-if [ -z "${FIND}" ]; then
+if [ -z "${FIND}" ] || [ "$REBUILD_DOCKER_IMAGE" == "yes" ]; then
     ./scripts/docker.sh
 fi
 
+FIND=`docker images | grep ${IMAGE_TEST}`
+if [ -z "${FIND}" ] || [ "$REBUILD_DOCKER_IMAGE" == "yes" ]; then
+    echo "Rebuild test image"
+    docker rmi ${IMAGE_TEST} -f > /dev/null 2>&1
+    docker build -t ${IMAGE_TEST} -f ./scripts/Test.Dockerfile .
+fi
+
 echo "Start container"
-docker run -id --privileged --name ${CONTAINER} ${IMAGE}
+docker run -id --privileged --name ${CONTAINER} ${IMAGE_TEST}
 docker cp . ${CONTAINER}:/root/src/sweetcomb
 docker exec -it ${CONTAINER} bash -c "
     cd /root/src/sweetcomb &&
-- 
cgit 1.2.3-korg