X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=juju-charms%2FMakefile;h=690904efc8fa5845d672e376ea2dcc97f529699a;hb=7a5344c988e3a9c11a2db896fd080659e16d3f59;hp=76d21ac5af50583d32fb059a60d5531162b1fce6;hpb=230c540cf52f3fbe05d40d6650a97d1e55327249;p=osm%2Fdevops.git

diff --git a/juju-charms/Makefile b/juju-charms/Makefile
index 76d21ac5..690904ef 100644
--- a/juju-charms/Makefile
+++ b/juju-charms/Makefile
@@ -17,19 +17,26 @@
 
 BUILD_DIR = .
 
-CHARMS:= pingpong vyos-proxy netutils
+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) $<
+endif