This commit is contained in:
aynic.os
2021-05-18 09:09:28 +02:00
parent 10de1d466e
commit 24b4f6988b
3 changed files with 10 additions and 6 deletions
+2 -2
View File
@@ -55,9 +55,9 @@ VERBOSE ?= true
VERSION ?= $(shell git describe --tags $(BRANCH) 2>/dev/null || git rev-parse $(BRANCH) 2>/dev/null)
ifeq ($(DOCKER), true)
ENV_ARGS = $(foreach var,$(ENV_VARS),$(if $($(var)),-e $(var)='$($(var))')) $(shell printenv |awk -F '=' 'NR == FNR { if($$1 !~ /^(\#|$$)/) { A[$$1]; next } } ($$1 in A) {print "-e "$$0}' .env.dist - 2>/dev/null)
ENV_ARGS = $(env.docker.args) $(env.docker.dist)
else
ENV_ARGS = $(foreach var,$(ENV_VARS),$(if $($(var)),$(var)='$($(var))')) $(shell printenv |awk -F '=' 'NR == FNR { if($$1 !~ /^(\#|$$)/) { A[$$1]; next } } ($$1 in A)' .env.dist - 2>/dev/null)
ENV_ARGS = $(env.args) $(env.dist)
endif
ifneq ($(DEBUG), true)