Skip to content

Commit 8b770dc

Browse files
authored
Docker build fixups (#181)
* fixup dockerfile test for when we don't build postgres * show plaintext build output
1 parent 21265a6 commit 8b770dc

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

docker/benchbase/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ RUN for profile in ${BENCHBASE_PROFILES}; do \
7171
rm -rf profiles/$profile/data/ && ln -s ../../data profiles/$profile/data; \
7272
done \
7373
&& test -d data \
74-
&& test "`readlink -f profiles/postgres/data`" = "/benchbase/data" \
74+
&& test "`readlink -f profiles/$(echo $BENCHBASE_PROFILES | awk '{ print $1 }')/data`" = "/benchbase/data" \
7575
&& mvn -B --file pom.xml clean \
7676
&& rm -rf ~/.m2/repository/* \
7777
&& rm -rf .git/

docker/benchbase/build-full-image.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ fi
4040
GID=$(getent passwd $UID | cut -d: -f4)
4141

4242
set -x
43-
docker build --build-arg=http_proxy=${http_proxy:-} --build-arg=https_proxy=${https_proxy:-} \
43+
docker build --progress=plain --build-arg=http_proxy=${http_proxy:-} --build-arg=https_proxy=${https_proxy:-} \
4444
--build-arg MAVEN_OPTS="-Dhttp.proxyHost=${http_proxy_host} -Dhttp.proxyPort=${http_proxy_port} -Dhttps.proxyHost=${https_proxy_host} -Dhttps.proxyPort=${https_proxy_port}" \
4545
--build-arg BENCHBASE_PROFILES="${BENCHBASE_PROFILES}" \
4646
--build-arg UID=$UID --build-arg GID=$GID \

0 commit comments

Comments
 (0)