commit 2dad22db3b963153865f37cf3a8a906e81b655ab
author Matteo Scandolo <matteo.scandolo@gmail.com> Thu Jan 12 15:43:44 2017 -0800
committer Matteo Scandolo <teo@onlab.us> Thu Jan 12 16:18:33 2017 -0800
tree 7c11fbb5c557ba5bd07cafb3cd3719b8f60f0207
parent 7c5aebc4c0b2b0f3fb321e619469af87f16955cb

Adding docker cache to UI containers

Change-Id: Ie5a8a69f4e037ec110a57ea938335e0c4e47f8a7

common/Makedefs

diff --git a/common/Makedefs b/common/Makedefs
index 72a4654..eb72299 100644
--- a/common/Makedefs
+++ b/common/Makedefs
@@ -1,6 +1,8 @@
 # common/Makedefs
 # Defines commonly used Makefile variables
 
+NO_DOCKER_CACHE      ?= false
+
 COMMON_DIR           ?= $(dir $(abspath $(lastword $(MAKEFILE_LIST))))
 CONFIG_DIR           ?= $(COMMON_DIR)
 

common/Makefile

diff --git a/common/Makefile b/common/Makefile
index c8b6b76..ce0b916 100644
--- a/common/Makefile
+++ b/common/Makefile
@@ -184,11 +184,11 @@
 
 xos_rest_gw_c:
 	# this folder is cloned by repo
-	cd $(LIBRARY_DIR)/xos-rest-gw; sudo docker build -t xosproject/xos-rest-gw .
+	cd $(LIBRARY_DIR)/xos-rest-gw; sudo docker build --no-cache=${NO_DOCKER_CACHE} -t xosproject/xos-rest-gw .
 
 xos_gui_c:
 	# this folder is cloned by repo
-	cd $(LIBRARY_DIR)/xos-gui; sudo docker build -t xosproject/xos-gui .
+	cd $(LIBRARY_DIR)/xos-gui; sudo docker build --no-cache=${NO_DOCKER_CACHE} -t xosproject/xos-gui .
 
 
 # utilties/convenience targets

frontend/xos-gui.yaml

diff --git a/frontend/xos-gui.yaml b/frontend/xos-gui.yaml
index 457e946..45c0b25 100644
--- a/frontend/xos-gui.yaml
+++ b/frontend/xos-gui.yaml
@@ -12,7 +12,6 @@
     xos-spa-gui:
       type: tosca.nodes.Component
       properties:
-        # command: cd /var/www; BRAND=opencloud npm run build
         name: xos-spa-gui
         image: xosproject/xos-gui
         ports: 4000:4000