From 1300800f1875d21440d3c944227c87ca693bae02 Mon Sep 17 00:00:00 2001 From: Andrei Litvin Date: Tue, 29 Nov 2022 16:09:37 -0500 Subject: [PATCH] Update build script for docker to not need to guess in advance a correct docker path (#23802) --- integrations/docker/build.sh | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/integrations/docker/build.sh b/integrations/docker/build.sh index cb52fe60746e89..cb063a2600b1da 100755 --- a/integrations/docker/build.sh +++ b/integrations/docker/build.sh @@ -65,7 +65,9 @@ set -ex [[ -n $VERSION ]] || die "version cannot be empty" -mb_space_before=$(df -m "$DOCKER_VOLUME_PATH" | awk 'FNR==2{print $3}') +if [ -f "$DOCKER_VOLUME_PATH" ]; then + mb_space_before=$(df -m "$DOCKER_VOLUME_PATH" | awk 'FNR==2{print $3}') +fi # go find and build any CHIP images this image is "FROM" awk -F/ '/^FROM connectedhomeip/ {print $2}' Dockerfile | while read -r dep; do @@ -98,9 +100,10 @@ docker image prune --force } docker images --filter=reference="$ORG/*" -df -h "$DOCKER_VOLUME_PATH" -mb_space_after=$(df -m "$DOCKER_VOLUME_PATH" | awk 'FNR==2{print $3}') - -printf "%'.f MB total used\n" "$((mb_space_before - mb_space_after))" +if [ -f "$DOCKER_VOLUME_PATH" ]; then + df -h "$DOCKER_VOLUME_PATH" + mb_space_after=$(df -m "$DOCKER_VOLUME_PATH" | awk 'FNR==2{print $3}') + printf "%'.f MB total used\n" "$((mb_space_before - mb_space_after))" +fi exit 0