X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=juju-charms%2FMakefile;h=d6aa754d6f054e226e2119908e13430e6dd4b2b5;hb=88ff0707bb747cbff713ae64899ab2de485d37d4;hp=76d21ac5af50583d32fb059a60d5531162b1fce6;hpb=2c2374199270b5e71f419369a9a5e111ea0df375;p=osm%2Fdevops.git

diff --git a/juju-charms/Makefile b/juju-charms/Makefile
index 76d21ac5..d6aa754d 100644
--- a/juju-charms/Makefile
+++ b/juju-charms/Makefile
@@ -24,12 +24,19 @@ 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) $<
+endif