From dddec4911433303db02cdedb7e98c7640fb89bda Mon Sep 17 00:00:00 2001
From: Brian Kroth <bpkroth@microsoft.com>
Date: Wed, 8 Jun 2022 16:29:32 -0500
Subject: [PATCH 1/2] fixup dockerfile test for when we don't build postgres

---
 docker/benchbase/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker/benchbase/Dockerfile b/docker/benchbase/Dockerfile
index 02847e156..5b56fd009 100644
--- a/docker/benchbase/Dockerfile
+++ b/docker/benchbase/Dockerfile
@@ -71,7 +71,7 @@ RUN for profile in ${BENCHBASE_PROFILES}; do \
         rm -rf profiles/$profile/data/ && ln -s ../../data profiles/$profile/data; \
     done \
     && test -d data \
-    && test "`readlink -f profiles/postgres/data`" = "/benchbase/data" \
+    && test "`readlink -f profiles/$(echo $BENCHBASE_PROFILES | awk '{ print $1 }')/data`" = "/benchbase/data" \
     && mvn -B --file pom.xml clean \
     && rm -rf ~/.m2/repository/* \
     && rm -rf .git/

From 4e91f13bbf6d0e7aba808d9f14df2d91b4999b8e Mon Sep 17 00:00:00 2001
From: Brian Kroth <bpkroth@microsoft.com>
Date: Wed, 8 Jun 2022 16:30:21 -0500
Subject: [PATCH 2/2] show plaintext build output

---
 docker/benchbase/build-full-image.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker/benchbase/build-full-image.sh b/docker/benchbase/build-full-image.sh
index 262ebf1dd..82d263ce5 100755
--- a/docker/benchbase/build-full-image.sh
+++ b/docker/benchbase/build-full-image.sh
@@ -40,7 +40,7 @@ fi
 GID=$(getent passwd $UID | cut -d: -f4)
 
 set -x
-docker build --build-arg=http_proxy=${http_proxy:-} --build-arg=https_proxy=${https_proxy:-} \
+docker build --progress=plain --build-arg=http_proxy=${http_proxy:-} --build-arg=https_proxy=${https_proxy:-} \
     --build-arg MAVEN_OPTS="-Dhttp.proxyHost=${http_proxy_host} -Dhttp.proxyPort=${http_proxy_port} -Dhttps.proxyHost=${https_proxy_host} -Dhttps.proxyPort=${https_proxy_port}" \
     --build-arg BENCHBASE_PROFILES="${BENCHBASE_PROFILES}" \
     --build-arg UID=$UID --build-arg GID=$GID \