From 4b388b0ba909ea8e8d0388b1eca6a6537fca9755 Mon Sep 17 00:00:00 2001
From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com>
Date: Fri, 30 Sep 2022 15:48:31 +0200
Subject: [PATCH] DOCKER_BUILDKIT=1 is not passed when using docker-compose
 (#2818) (#2910)

* DOCKER_BUILDKIT=1 is not passed when using docker-compose

DOCKER_BUILDKIT=1 is not passed when using docker-compose it needs to be changed to DOCKER_BUILDKIT=1 COMPOSE_DOCKER_CLI_BUILD=1 in order to make
e.g:
make localnet-build  works

* Update Makefile

changed only
from
@DOCKER_BUILDKIT=1
to
@DOCKER_BUILDKIT=1 COMPOSE_DOCKER_CLI_BUILD=1

* Update Makefile

fix spaces

* Update Makefile

sorry for wasting your time :D

* Update Makefile

* Update Makefile

Co-authored-by: Niccolo Raspa <6024049+niccoloraspa@users.noreply.github.com>
(cherry picked from commit 3c7eab90146396d7cb5ee7f4580244be78bf44f6)

Co-authored-by: punishell <33149001+punishell@users.noreply.github.com>
---
 Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 46f49e2a935..df69220e32a 100644
--- a/Makefile
+++ b/Makefile
@@ -372,7 +372,7 @@ localnet-keys:
 localnet-init: localnet-clean localnet-build
 
 localnet-build:
-	@DOCKER_BUILDKIT=1 docker-compose -f tests/localosmosis/docker-compose.yml build
+	@DOCKER_BUILDKIT=1 COMPOSE_DOCKER_CLI_BUILD=1 docker-compose -f tests/localosmosis/docker-compose.yml build
 
 localnet-start:
 	@STATE="" docker-compose -f tests/localosmosis/docker-compose.yml up
@@ -395,7 +395,7 @@ localnet-clean:
 localnet-state-export-init: localnet-state-export-clean localnet-state-export-build 
 
 localnet-state-export-build:
-	@DOCKER_BUILDKIT=1 docker-compose -f tests/localosmosis/state_export/docker-compose.yml build
+	@DOCKER_BUILDKIT=1 COMPOSE_DOCKER_CLI_BUILD=1 docker-compose -f tests/localosmosis/state_export/docker-compose.yml build
 
 localnet-state-export-start:
 	@docker-compose -f tests/localosmosis/state_export/docker-compose.yml up