From da008740c4b788ff21738c0f6086769867e3c4ac Mon Sep 17 00:00:00 2001 From: simu Date: Tue, 18 Jan 2022 12:07:29 +0000 Subject: [PATCH] Update from projectsyn/modulesync-control --- Makefile | 2 +- Makefile.vars.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index c17955dd..b0522658 100644 --- a/Makefile +++ b/Makefile @@ -69,4 +69,4 @@ golden-diff: clean .compile ## Diff compile output against the reference version .PHONY: clean clean: ## Clean the project - rm -rf compiled dependencies vendor helmcharts jsonnetfile*.json || true + rm -rf .cache compiled dependencies vendor helmcharts jsonnetfile*.json || true diff --git a/Makefile.vars.mk b/Makefile.vars.mk index 33fba5e4..3204e79c 100644 --- a/Makefile.vars.mk +++ b/Makefile.vars.mk @@ -13,7 +13,7 @@ compiled_volume ?= -v "$${PWD}/$(compiled_path):/$(COMPONENT_NAME)" commodore_args ?= --search-paths ./dependencies --search-paths . DOCKER_CMD ?= docker -DOCKER_ARGS ?= run --rm -u "$$(id -u)" -w /$(COMPONENT_NAME) +DOCKER_ARGS ?= run --rm -u "$$(id -u):$$(id -g)" -w /$(COMPONENT_NAME) -e HOME="/$(COMPONENT_NAME)" JSONNET_FILES ?= $(shell find . -type f -not -path './vendor/*' \( -name '*.*jsonnet' -or -name '*.libsonnet' \)) JSONNETFMT_ARGS ?= --in-place --pad-arrays