X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=descriptor-packages%2Fmk%2Fpkg.mk;fp=descriptor-packages%2Fmk%2Fpkg.mk;h=02646026e91431c7c557df9936d688f2eed136fb;hb=b884a463086b9841ef3f7b324f320db5e6e11492;hp=350af35e6f8af8dd9f2a3a47fd0883515687ae68;hpb=731c1c6319437224de4a42f69a242a411c53874a;p=osm%2Fdevops.git

diff --git a/descriptor-packages/mk/pkg.mk b/descriptor-packages/mk/pkg.mk
index 350af35e..02646026 100644
--- a/descriptor-packages/mk/pkg.mk
+++ b/descriptor-packages/mk/pkg.mk
@@ -24,6 +24,7 @@ CHARM_DIR        := $(TOPDIR)/juju-charms
 CHARM_SRC_DIR    := $(CHARM_DIR)/layers
 CHARM_DOCKER_TAG := charm-tools
 CHARM_BUILD_DIR  := $(CHARM_DIR)/builds
+DOCKER_BUILD     ?= $(shell which docker)
 
 Q=@
 
@@ -57,9 +58,14 @@ $(BUILD_DIR)/$(PKG_NAME): $(BUILD_DIR)/$(PKG_BASE_NAME)
 	$(Q)$(GEN_PKG) --no-remove-files -d $(BUILD_DIR) $(BUILD_DIR)/$(PKG_BASE_NAME)
 endif
 
+ifdef DOCKER_BUILD
 $(CHARM_BUILD_DIR)/%: $(CHARM_SRC_DIR)/%
 	$(Q)docker build -q -t $(CHARM_DOCKER_TAG) $(CHARM_DIR)/.
-	$(Q)docker run -u $$(id -u):$$(id -g) -v$(CHARM_DIR):$(CHARM_DIR) -w$(CHARM_DIR) $(CHARM_DOCKER_TAG) charm-build -o $(CHARM_DIR) $<
+	$(CHARM_DIR) $(CHARM_DOCKER_TAG) charm-build -o $(CHARM_DIR) $<
+else
+$(CHARM_BUILD_DIR)/%: $(CHARM_SRC_DIR)/%
+	$(Q)charm-build -o $(CHARM_DIR) $<
+endif
  
 clean:
 	$(Q)rm -rf $(BUILD_DIR)