From 2402fde5c34c657fed86799eceecedfcb44a7835 Mon Sep 17 00:00:00 2001
From: Jon Schoning <jonschoning@gmail.com>
Date: Sat, 30 Apr 2022 19:55:45 -0500
Subject: [PATCH] update to docker compose v2

---
 Makefile | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/Makefile b/Makefile
index c0a52b7..b582ae4 100644
--- a/Makefile
+++ b/Makefile
@@ -1,3 +1,6 @@
+_DOCKER:=docker
+_DOCKER_COMPOSE:=docker compose
+
 .PHONY: clean build
 
 all: build
@@ -26,7 +29,7 @@ migrate-createdb:
 serve:
 	@stack exec espial -- +RTS -T
 
-_ESPIAL_PS_ID = $$(docker-compose ps -q espial)
+_ESPIAL_PS_ID = $$($(_DOCKER_COMPOSE) ps -q espial)
 _LOCAL_INSTALL_PATH = $$(stack path | grep local-install-root | awk -e '{print $$2}')
 _EKG_ASSETS_PATH = $$(find ~/.stack -type d | grep ekg.*assets)
 
@@ -38,20 +41,20 @@ docker-compose-build: build
 	@cp -R config dist
 	@mkdir -p dist/ekg/assets
 	@cp -R $(_EKG_ASSETS_PATH) dist/ekg
-	@docker-compose build espial
+	@$(_DOCKER_COMPOSE) build espial
 docker-compose-up:
-	@docker-compose up --no-deps --no-build espial
+	@$(_DOCKER_COMPOSE) up --no-deps --no-build espial
 docker-compose-down:
-	@docker-compose down
+	@$(_DOCKER_COMPOSE) down
 docker-compose-up-d:
-	@docker-compose up --no-deps --no-build -d espial
+	@$(_DOCKER_COMPOSE) up --no-deps --no-build -d espial
 docker-compose-pull:
-	@docker-compose pull espial
+	@$(_DOCKER_COMPOSE) pull espial
 docker-compose-push:
 	@docker tag localhost/espial:espial $(HUB_REPO)/espial:espial
-	@docker-compose push espial
+	@$(_DOCKER_COMPOSE) push espial
 docker-espial-logs:
-	@docker logs -f --since `date -u +%FT%TZ` $(_ESPIAL_PS_ID)
+	@$(_DOCKER) logs -f --since `date -u +%FT%TZ` $(_ESPIAL_PS_ID)
 docker-espial-shell:
 	@$(docker_espial) sh
 
@@ -61,7 +64,7 @@ ifeq ($(_HUB_REPO),)
 	_HUB_REPO := "localhost"
 endif
 
-docker_espial = docker-compose exec espial
+docker_espial = $(_DOCKER_COMPOSE) exec espial
 
 clean:
 	@stack clean