update descriptor-packages build process
Change-Id: I937d0897a051b655f9de87f49a88610a37c9297e
Signed-off-by: Mike Marchetti <mmarchetti@sandvine.com>
diff --git a/juju-charms/Makefile b/juju-charms/Makefile
index a579390..76d21ac 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 @@
-@ $(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) $<