Merge "Add build_dir variable for build"

[osm/devops.git] / juju-charms / Makefile

diff --git a/juju-charms/Makefile b/juju-charms/Makefile
index a579390..690904e 100644 (file)
--- a/juju-charms/Makefile
+++ b/juju-charms/Makefile
@@ -17,17 +17,26 @@
 
 BUILD_DIR = .
 
-CHARMS:= vpe-router vyos-proxy pingpong flownac sandvine-pts-proxy
+CHARMS:= pingpong vyos-proxy netutils simple
 CHARM_SRC_DIR := layers
 CHARM_BUILD_DIR := $(BUILD_DIR)/builds
 
 CHARM_SRC_DIRS := $(addprefix $(CHARM_SRC_DIR)/, $(CHARMS))
 CHARM_BUILD_DIRS := $(addprefix $(CHARM_BUILD_DIR)/, $(CHARMS))
+CHARM_DOCKER_TAG := charm-tools
+DOCKER_BUILD     ?=
 
 all: $(CHARM_BUILD_DIRS)
 
 clean:
        -@ $(RM) -rf $(CHARM_BUILD_DIR)
 
+
+ifdef DOCKER_BUILD
+$(CHARM_BUILD_DIR)/%: $(CHARM_SRC_DIR)/%
+       docker build -t $(CHARM_DOCKER_TAG) .
+       docker run -u $$(id -u):$$(id -g) -v$$(pwd):$$(pwd) -w$$(pwd) $(CHARM_DOCKER_TAG) charm-build -o $(BUILD_DIR) $<
+else
 $(CHARM_BUILD_DIR)/%: $(CHARM_SRC_DIR)/%
-       charm-build -o $(BUILD_DIR) $<
+       charm build -o $(BUILD_DIR) $<
+endif