From e12f8f248d0b74f8ad884095aaa2246e84b02ba5 Mon Sep 17 00:00:00 2001
From: Corentin Le Molgat <corentinl@google.com>
Date: Fri, 30 Aug 2024 15:21:07 +0200
Subject: [PATCH] tools/docker: Add VERBOSE option

---
 tools/docker/Makefile | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/tools/docker/Makefile b/tools/docker/Makefile
index 0ee648d23c..33ff1533a0 100644
--- a/tools/docker/Makefile
+++ b/tools/docker/Makefile
@@ -132,6 +132,7 @@ help:
 	@echo -e "\te.g. 'make arm64_almalinux-9_export'"
 	@echo
 	@echo -e "\t${BOLD}NOCACHE=1${RESET}: use 'docker build --no-cache' when building container (default use cache)."
+	@echo -e "\t${BOLD}VERBOSE=1${RESET}: use 'docker build --progress=plain' when building container."
 	@echo
 	@echo -e "${BOLD}NOTES${RESET}"
 	@echo -e "\tAll generated code will be located in the export/ folder, use target ${BOLD}distclean${RESET} to remove it."
@@ -161,14 +162,16 @@ $(info version: ${OR_TOOLS_VERSION})
 # Docker image name prefix.
 IMAGE := or-tools/docker
 
-ifdef NOCACHE
-DOCKER_BUILD_CMD := docker build --no-cache
-DOCKER_BUILDX_CMD := docker buildx build --no-cache
-else
 DOCKER_BUILD_CMD := docker build
 DOCKER_BUILDX_CMD := docker buildx build
+ifdef NOCACHE
+DOCKER_BUILD_CMD := ${DOCKER_BUILD_CMD} --no-cache
+DOCKER_BUILDX_CMD := ${DOCKER_BUILDX_CMD} --no-cache
+endif
+ifdef VERBOSE
+DOCKER_BUILD_CMD := ${DOCKER_BUILD_CMD} --progress=plain
+DOCKER_BUILDX_CMD := ${DOCKER_BUILDX_CMD} --progress=plain
 endif
-DOCKER_RUN_CMD := docker run --rm --init
 
 #################
 ###  DELIVERY  ##