Skip to content

Commit

Permalink
Merge pull request #51 from projectsyn/modulesync-a180fbc
Browse files Browse the repository at this point in the history
[ModuleSync] Update from projectsyn/modulesync-control@a180fbc
  • Loading branch information
simu authored Jan 18, 2022
2 parents eac0c47 + da00874 commit 2b45c87
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion Makefile.vars.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 2b45c87

Please sign in to comment.