From 4b9117f9420b495eb4d93e866837d17a031eebf9 Mon Sep 17 00:00:00 2001
From: Andreas Neue <an@dnix.de>
Date: Tue, 20 Sep 2022 13:38:18 +0200
Subject: [PATCH] include secrets.mk

---
 Makefile  | 1 +
 docker.mk | 6 +++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 8285571..c952de0 100644
--- a/Makefile
+++ b/Makefile
@@ -5,6 +5,7 @@ include make-deploy/k8s.mk
 include make-deploy/cron.mk
 
 include config.mk
+include secrets.mk
 
 self-update:
 	@- git submodule update --remote
diff --git a/docker.mk b/docker.mk
index 149d6f3..1305315 100644
--- a/docker.mk
+++ b/docker.mk
@@ -32,7 +32,11 @@ pull-compose:
 	@- echo "\n### pulling image(s)"
 	@- $(foreach ctx,$(DEPLOY_HOSTS), \
 		docker context use $(ctx); \
-		if [ $(DOCKER_LOGIN) == 'true' ] then docker login -u $(DOCKER_USER) -p $(DOCKER_PASS) $(DOCKER_REGISTRY) fi; \
+		docker context use $(ctx); \
+		if test $(DOCKER_LOGIN) -eq 1 ; \
+		then \
+			docker login -u $(DOCKER_USER) -p $(DOCKER_PASS) $(DOCKER_REGISTRY); \
+		fi; \
 		docker pull $(DOCKER_IMAGE); \
 	)