commit 9f23ac58f4b83d54dd292ad4b0f6b4b07b700694
author Scott Baker <smbaker@gmail.com> Fri Nov 04 14:48:09 2016 -0700
committer Scott Baker <smbaker@gmail.com> Mon Nov 07 10:21:00 2016 -0800
tree 1f12dbb70ae31ed4757f9d2a933fdf85629955dd
parent c1b451f66bafc0212c107f054780224aad5f4754

don't rebuild base container if it exists

Change-Id: Ib3ea026d11792006c5ed0ab32e5caf6e20b3de4e

common/Makefile

diff --git a/common/Makefile b/common/Makefile
index 48d9277..f8361ec 100644
--- a/common/Makefile
+++ b/common/Makefile
@@ -2,6 +2,8 @@
 
 include $(COMMON_DIR)/Makedefs
 
+HAS_BASE=$(shell docker images | grep xos-base )
+
 # prerequisite software
 .PHONY: prereqs
 prereqs: /usr/bin/http /usr/bin/docker /usr/bin/curl /usr/local/bin/docker-compose
@@ -165,7 +167,9 @@
 	done
 
 xos_base_c:
-	cd $(XOS_DIR)/containers/xos; make base
+	@[ -z "$(HAS_BASE)" ] || echo "skipping base container build"
+	@[ -n "$(HAS_BASE)" ] || ( cd $(XOS_DIR)/containers/xos; make base )   
+#	cd $(XOS_DIR)/containers/xos; make base
 
 xos_devel_c:
 	cd $(XOS_DIR)/containers/xos; make devel