From ffef126f03bec457979a8dbbea78c7914e8c0d3e Mon Sep 17 00:00:00 2001 From: "ryan-distrust.co" Date: Sat, 13 May 2023 01:03:35 -0400 Subject: [PATCH] Makefile: allow binary override --- Makefile | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index e875bbe..4b72995 100644 --- a/Makefile +++ b/Makefile @@ -47,14 +47,14 @@ $(OUT_DIR)/website/index.html: \ ") infra/backend/.terraform: \ - $(OUT_DIR)/terraform \ + $(TERRAFORM) \ $(BACKEND_TF) $(SOPS) exec-env secrets/$(ENVIRONMENT).enc.env '\ env -C infra/backend $(TERRAFORM) init -upgrade \ ' infra/main/.terraform: | \ - $(OUT_DIR)/terraform \ + $(TERRAFORM) \ config/$(ENVIRONMENT).tfbackend \ $(MAIN_TF) $(SOPS) exec-env secrets/$(ENVIRONMENT).enc.env '\ @@ -63,8 +63,8 @@ infra/main/.terraform: | \ ' infra/backend/$(ENVIRONMENT).tfstate: \ - $(OUT_DIR)/terraform \ - $(OUT_DIR)/sops \ + $(TERRAFORM) \ + $(SOPS) \ infra/backend/.terraform $(SOPS) exec-env secrets/$(ENVIRONMENT).enc.env '\ env -C infra/backend \ @@ -76,8 +76,8 @@ infra/backend/$(ENVIRONMENT).tfstate: \ ' config/$(ENVIRONMENT).tfbackend: | \ - $(OUT_DIR)/terraform - $(OUT_DIR)/sops \ + $(TERRAFORM) \ + $(SOPS) \ # File is not committed and this has no shared state $(MAKE) infra/backend/$(ENVIRONMENT).tfstate $(SOPS) exec-env secrets/$(ENVIRONMENT).enc.env '\ @@ -89,8 +89,8 @@ config/$(ENVIRONMENT).tfbackend: | \ .PHONY: apply: \ - $(OUT_DIR)/terraform \ - $(OUT_DIR)/sops \ + $(TERRAFORM) \ + $(SOPS) \ infra/main/.terraform $(call maybe_decrypt_secret,secrets/$(ENVIRONMENT).talosconfig,infra/main/talos/talosconfig) $(call maybe_decrypt_secret,secrets/$(ENVIRONMENT).kubeconfig,infra/main/talos/kubeconfig)