Docker build fixups (cmu-db#181)

* fixup dockerfile test for when we don't build postgres * show plaintext build output
shaharuk-yb · Jun 8, 2022 · 8b770dc · 8b770dc
1 parent 21265a6
commit 8b770dc
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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/

diff --git 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 \