From 000b7c8cf491682150792fe42fe7aedba75caff9 Mon Sep 17 00:00:00 2001
From: William Petit <wpetit@cadoles.com>
Date: Thu, 2 Nov 2023 18:46:46 +0100
Subject: [PATCH] feat: integrate mktools

---
 .gitignore |  4 +++-
 Makefile   | 20 +++++++++++++++-----
 2 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index 9c23cd3..d9bfdf8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,6 @@
 /vendor
 /data
 /bin
-/.vscode
\ No newline at end of file
+/.vscode
+/tools
+/.mktools
diff --git a/Makefile b/Makefile
index 4a91d79..47c78e6 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 DOKKU_HOST := dokku@dev.lookingfora.name
 SHELL := /bin/bash
-DOCKER_IMAGE_NAME ?= bornholm/oidc-test
-DOCKER_IMAGE_TAG ?= $(shell git describe)
+DOCKER_IMAGE_NAME ?= reg.cadoles.com/cadoles/oidc-test
+DOCKER_IMAGE_TAG ?= $(MKT_PROJECT_VERSION)
 
 build:
 	CGO_ENABLED=0 go build -v -o ./bin/server ./cmd/server
@@ -39,16 +39,26 @@ dokku-deploy:
 	$(if $(shell git config remote.dokku-oidc-test.url),, git remote add dokku-oidc-test $(DOKKU_HOST):oidc-test)
 	git push -f dokku-oidc-test $(shell git rev-parse HEAD):refs/heads/master	
 
-docker-build:
+docker-build: .mktools
 	docker build \
 		-f ./misc/dokku/Dockerfile \
 		-t $(DOCKER_IMAGE_NAME):latest \
 		.
 
-docker-release: docker-build
+docker-release: .mktools docker-build
 	docker image tag $(DOCKER_IMAGE_NAME):latest $(DOCKER_IMAGE_NAME):$(DOCKER_IMAGE_TAG)
 	docker login
 	docker push $(DOCKER_IMAGE_NAME):$(DOCKER_IMAGE_TAG)
 	docker push $(DOCKER_IMAGE_NAME):latest
 
-.PHONY: lint watch build vendor tidy release
\ No newline at end of file
+.PHONY: lint watch build vendor tidy release
+
+.PHONY: mktools
+mktools:
+	rm -rf .mktools
+	curl -q https://forge.cadoles.com/Cadoles/mktools/raw/branch/master/install.sh | $(SHELL)
+
+.mktools:
+	$(MAKE) mktools
+
+-include .mktools/*.mk
\ No newline at end of file