more fixes fixing things to be fixed
This commit is contained in:
		
							parent
							
								
									deb24ec5ae
								
							
						
					
					
						commit
						8f527a16a3
					
				
					 9 changed files with 12 additions and 12 deletions
				
			
		
							
								
								
									
										2
									
								
								apt.mk
									
										
									
									
									
								
							
							
						
						
									
										2
									
								
								apt.mk
									
										
									
									
									
								
							| 
						 | 
					@ -1,4 +1,4 @@
 | 
				
			||||||
MANDATORY = $(MANDATORY) APT_PACKAGES
 | 
					MANDATORY = $(shell printenv MANDATORY) APT_PACKAGES
 | 
				
			||||||
 | 
					
 | 
				
			||||||
pull-apt:
 | 
					pull-apt:
 | 
				
			||||||
	# nop
 | 
						# nop
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -1,4 +1,4 @@
 | 
				
			||||||
MANDATORY-compose-file = DEPLOY_HOSTS DEPLOY_TYPE SSH_USER DEPLOY_COMPOSE_FILE DEPLOY_COMPOSE_PROJECT
 | 
					MANDATORY = $(shell printenv MANDATORY) SSH_USER DEPLOY_COMPOSE_FILE DEPLOY_COMPOSE_PROJECT
 | 
				
			||||||
 | 
					
 | 
				
			||||||
ifndef DOCKER_LOGIN
 | 
					ifndef DOCKER_LOGIN
 | 
				
			||||||
DOCKER_LOGIN = 0
 | 
					DOCKER_LOGIN = 0
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
							
								
								
									
										2
									
								
								cron.mk
									
										
									
									
									
								
							
							
						
						
									
										2
									
								
								cron.mk
									
										
									
									
									
								
							| 
						 | 
					@ -1,4 +1,4 @@
 | 
				
			||||||
MANDATORY-cron = true
 | 
					MANDATORY = $(shell printenv MANDATORY) CRON_USER 
 | 
				
			||||||
 | 
					
 | 
				
			||||||
start-cron:
 | 
					start-cron:
 | 
				
			||||||
	@- echo "\n### starting..."
 | 
						@- echo "\n### starting..."
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
							
								
								
									
										2
									
								
								helm.mk
									
										
									
									
									
								
							
							
						
						
									
										2
									
								
								helm.mk
									
										
									
									
									
								
							| 
						 | 
					@ -1,4 +1,4 @@
 | 
				
			||||||
MANDATORY-helm = K8S_CONTEXT HELM_CHART_NAME HELM_CHART_PATH HELM_VALUES_FILE NAMESPACE
 | 
					MANDATORY = $(shell printenv MANDATORY) K8S_CONTEXT HELM_CHART_NAME HELM_CHART_PATH HELM_VALUES_FILE NAMESPACE
 | 
				
			||||||
# helm
 | 
					# helm
 | 
				
			||||||
#
 | 
					#
 | 
				
			||||||
# deploys helm charts on k8s via helm
 | 
					# deploys helm charts on k8s via helm
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
							
								
								
									
										2
									
								
								k8s.mk
									
										
									
									
									
								
							
							
						
						
									
										2
									
								
								k8s.mk
									
										
									
									
									
								
							| 
						 | 
					@ -2,7 +2,7 @@
 | 
				
			||||||
#
 | 
					#
 | 
				
			||||||
# deploys k8s
 | 
					# deploys k8s
 | 
				
			||||||
 | 
					
 | 
				
			||||||
MANDATORY = K8S_CONTEXT
 | 
					MANDATORY = $(shell printenv MANDATORY) K8S_CONTEXT
 | 
				
			||||||
 | 
					
 | 
				
			||||||
start-k8s:
 | 
					start-k8s:
 | 
				
			||||||
	@- echo "\n### starting deployment with k8s"
 | 
						@- echo "\n### starting deployment with k8s"
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -1,4 +1,4 @@
 | 
				
			||||||
MANDATORY = K8S_CONTEXT KUSTOMIZE_FOLDER NAMESPACE
 | 
					MANDATORY = $(shell printenv MANDATORY) K8S_CONTEXT KUSTOMIZE_FOLDER NAMESPACE
 | 
				
			||||||
# kustomize
 | 
					# kustomize
 | 
				
			||||||
#
 | 
					#
 | 
				
			||||||
# this uses kustomize to install stuff on k8s
 | 
					# this uses kustomize to install stuff on k8s
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -1,10 +1,12 @@
 | 
				
			||||||
#MANDATORY = $(MANDATORY) DEPLOY_PATH
 | 
					# simple 
 | 
				
			||||||
 | 
					 | 
				
			||||||
# copy
 | 
					 | 
				
			||||||
#
 | 
					#
 | 
				
			||||||
# this just rsyncs the stuff to the remote server(s) and runs
 | 
					# this just rsyncs the stuff to the remote server(s) and runs
 | 
				
			||||||
# build.sh, pre-/post-deploy, pre-/post-local, start.sh, etc.
 | 
					# build.sh, pre-/post-deploy, pre-/post-local, start.sh, etc.
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					ifndef DEPLOY_StART_DELAY
 | 
				
			||||||
 | 
					DEPLOY_START_DELAY = 0
 | 
				
			||||||
 | 
					endif
 | 
				
			||||||
 | 
					
 | 
				
			||||||
pull-simple:
 | 
					pull-simple:
 | 
				
			||||||
	# nop
 | 
						# nop
 | 
				
			||||||
	
 | 
						
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
							
								
								
									
										2
									
								
								swarm.mk
									
										
									
									
									
								
							
							
						
						
									
										2
									
								
								swarm.mk
									
										
									
									
									
								
							| 
						 | 
					@ -1,5 +1,3 @@
 | 
				
			||||||
MANDATORY = DEPLOY_PATH DEPLOY_NAME DEPLOY_HOSTS DEPLOY_TYPE
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
pull-swarm:
 | 
					pull-swarm:
 | 
				
			||||||
 | 
					
 | 
				
			||||||
start-swarm:
 | 
					start-swarm:
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
							
								
								
									
										2
									
								
								tf.mk
									
										
									
									
									
								
							
							
						
						
									
										2
									
								
								tf.mk
									
										
									
									
									
								
							| 
						 | 
					@ -1,4 +1,4 @@
 | 
				
			||||||
MANDATORY = $(MANDATORY) TF_FLAGS
 | 
					MANDATORY = $(shell printenv MANDATORY) TF_FLAGS
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# tf
 | 
					# tf
 | 
				
			||||||
#
 | 
					#
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue