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

diff --git a/juju-charms/Makefile b/juju-charms/Makefile
index a579390f..76d21ac5 100644
--- a/juju-charms/Makefile
+++ b/juju-charms/Makefile
@@ -17,12 +17,13 @@
 
 BUILD_DIR = .
 
-CHARMS:= vpe-router vyos-proxy pingpong flownac sandvine-pts-proxy
+CHARMS:= pingpong vyos-proxy netutils
 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
 
 all: $(CHARM_BUILD_DIRS)
 
@@ -30,4 +31,5 @@ clean:
 	-@ $(RM) -rf $(CHARM_BUILD_DIR)
 
 $(CHARM_BUILD_DIR)/%: $(CHARM_SRC_DIR)/%
-	charm-build -o $(BUILD_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) $<