fix mandatory handling

2024-06-05 09:43:19 +02:00 · 2024-06-05 09:43:19 +02:00 · 37bb6e9c12
parent c5ed8be31b
commit 37bb6e9c12
5 changed files with 9 additions and 5 deletions
--- a/2
+++ b/2
@ -1,5 +1,7 @@
 DEPLOY_START_DELAY = 0

+MANDATORY = DEPLOY_NAME DEPLOY_HOSTS DEPLOY_PATH SSH_USER
+
 -include secrets.mk
 include config.mk
 -include $(DEPLOY_CONFIG_OVERRIDE)
--- a/apt.mk
+++ b/apt.mk
@ -1,4 +1,4 @@
-MANDATORY-apt = DEPLOY_HOSTS SSH_USER APT_PACKAGES DEPLOY_NAME
+MANDATORY = $(MANDATORY) APT_PACKAGES

 pull-apt:
 	# nop
--- a/compose.mk
+++ b/compose.mk
@ -1,4 +1,6 @@
-MANDATORY-compose = DEPLOY_HOSTS DEPLOY_TYPE SSH_USER DEPLOY_NAME
+ifdef DOCKER_LOGIN
+MANDATORY = $(MANDATORY) DOCKER_USER DOCKER_PASS DOCKER_REGISTRY
+endif

 ifndef DOCKER_LOGIN
 DOCKER_LOGIN = 0
--- a/simple.mk
+++ b/simple.mk
@ -1,5 +1,4 @@
-MANDATORY-copy = DEPLOY_TYPE DEPLOY_HOSTS SSH_USER DEPLOY_PATH DEPLOY_NAME
-MANDATORY-simple = $(MANDATORY-copy)
+#MANDATORY = $(MANDATORY) DEPLOY_PATH

 # copy
 #
--- a/tf.mk
+++ b/tf.mk
@ -1,4 +1,5 @@
-MANDATORY-tf = 
+MANDATORY = $(MANDATORY) TF_FLAGS
+
 # tf
 #
 # deploys via tf apply