X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=juju-charms%2FMakefile;h=690904efc8fa5845d672e376ea2dcc97f529699a;hb=6f50dedea4b9e4274a0c8d38bfca0267405242c3;hp=a579390f1decbdb965384268d39db1ae5fd4424c;hpb=8f83069696a74f3fc9272a5c65d5e75e923e7ff9;p=osm%2Fdevops.git

diff --git a/juju-charms/Makefile b/juju-charms/Makefile
index a579390f..690904ef 100644
--- 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