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>

1 files changed, 7 insertions, 2 deletions

diff --git a/Makefile b/Makefile
index 28226a7..2b2e93c 100644
--- a/Makefile
+++ b/Makefile
@@ -28,6 +28,8 @@
 export WS_ROOT=$(CURDIR)
 export BR=$(WS_ROOT)/build-root
 PLATFORM?=sweetcomb
+export VPP_VERSION?=release
+export REBUILD_DOCKER_IMAGE?=no
 
 ##############
 #OS Detection#
@@ -103,8 +105,11 @@ help:
 	@echo " build-plugins          - build plugins"
 	@echo " build-gnmi             - build gNMIServer"
 	@echo " build-package          - build rpm or deb package"
-	@echo " docker                 - build sweetcomb in docker enviroment"
-	@echo " docker-test            - run test in docker enviroment"
+	@echo " docker                 - build sweetcomb in docker enviroment, with optional arguments :"
+	@echo "                          VPP_VERSION=release [master|release] specifies VPP version to be used"
+	@echo "                          REBUILD_DOCKER_IMAGE=no [yes|no] force rebuild docker image"
+	@echo " docker-test            - run test in docker enviroment, with optional argument :"
+	@echo "                          REBUILD_DOCKER_IMAGE=no [yes|no] force rebuild docker image"
 	@echo " clean                  - clean all build"
 	@echo " distclean              - remove all build directory"
 	@echo " checkstyle             - check coding style"