From 744951d8b845a7dfa3f58a6827c12a3da28f768b Mon Sep 17 00:00:00 2001 From: salverius-tech Date: Mon, 1 Apr 2024 17:45:47 -0700 Subject: [PATCH] Workaround fix for Build Dependencies issue --- Makefile | 14 -------------- make.d/install.mk | 8 +++++++- 2 files changed, 7 insertions(+), 15 deletions(-) diff --git a/Makefile b/Makefile index b70c9a4e..51b07373 100644 --- a/Makefile +++ b/Makefile @@ -255,20 +255,6 @@ count-services: ## ######################################################### -ifneq (,$(wildcard ./environments-enabled/onramp-external.env)) - BUILD_DEPENDENCIES += environments-enabled/onramp-external.env -endif - -environments-enabled/onramp-external.env: - cp --no-clobber ./environments-available/onramp-external.template ./environments-enabled/onramp-external.env - -ifneq (,$(wildcard ./environments-enabled/onramp-nfs.env)) - BUILD_DEPENDENCIES += environments-enabled/onramp-nfs.env -endif - -environments-enabled/onramp-nfs.env: - cp --no-clobber ./environments-available/onramp-nfs.template ./environments-enabled/onramp-nfs.env - ifneq (,$(wildcard ./services-enabled/authelia.yml)) BUILD_DEPENDENCIES += etc/authelia/configuration.yml endif diff --git a/make.d/install.mk b/make.d/install.mk index be6e2672..784ade19 100644 --- a/make.d/install.mk +++ b/make.d/install.mk @@ -25,7 +25,7 @@ fix-acme-json-permissions: fi \ fi -build: install-dependencies environments-enabled/onramp.env $(BUILD_DEPENDENCIES) +build: install-dependencies environments-enabled/onramp.env environments-enabled/onramp-external.env environments-enabled/onramp-nfs.env $(BUILD_DEPENDENCIES) install: build install-docker @@ -54,6 +54,12 @@ environments-enabled/onramp.env: @echo "" @python3 scripts/env-subst.py environments-available/onramp.template "ONRAMP" +environments-enabled/onramp-external.env: + cp --no-clobber ./environments-available/onramp-external.template ./environments-enabled/onramp-external.env + +environments-enabled/onramp-nfs.env: + cp --no-clobber ./environments-available/onramp-nfs.template ./environments-enabled/onramp-nfs.env + REPOS = rmescandon/yq ansible/ansible MISSING_REPOS := $(foreach repo,$(REPOS),$(if $(shell apt-cache policy | grep $(repo)),,addrepo/$(repo)))