Skip to content

Commit

Permalink
Workaround fix for Build Dependencies issue
Browse files Browse the repository at this point in the history
  • Loading branch information
salverius-tech committed Apr 2, 2024
1 parent b6195db commit 744951d
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 15 deletions.
14 changes: 0 additions & 14 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 7 additions & 1 deletion make.d/install.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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)))

Expand Down

0 comments on commit 744951d

Please sign in to comment.