Skip to content

Commit

Permalink
Groom docker_build.sh (#318)
Browse files Browse the repository at this point in the history
* Groom docker_build.sh

* more grooming, remove obsolete
  • Loading branch information
Rob Walker authored Apr 9, 2020
1 parent e6c95b0 commit bacbce7
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 16 deletions.
8 changes: 0 additions & 8 deletions integrations/docker/docker_build.sh

This file was deleted.

5 changes: 2 additions & 3 deletions integrations/docker/run_build.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
#!/usr/bin/env bash
# Note: this needs to be run from the root directory presently.
# https://github.com/project-chip/connectedhomeip/issues/273
# This script assumes it's being run from the ToT

./bootstrap && mkdir -p build/default && (cd build/default && ../../configure --enable-coverage --enable-coverage-info) && make -C build/default distcheck
./bootstrap && mkdir -p build/default && (cd build/default && ../../configure --enable-coverage) && make -C build/default "${@:-distcheck}"
13 changes: 8 additions & 5 deletions integrations/docker/run_docker_build.sh
Original file line number Diff line number Diff line change
@@ -1,12 +1,15 @@
#!/usr/bin/env bash
# Note: this needs to be run from the root directory presently.
# https://github.com/project-chip/connectedhomeip/issues/273

set -e
here=$(cd "$(dirname "$0")" && pwd)
# update me if I move out of integrations/docker
# |
# +---------------+
# V
SOURCE_PATH=$(cd "${here}/../.." && pwd)

VERSION=$(cat integrations/docker/images/chip-build/version)
ORGANIZATION="connectedhomeip"
IMAGE="chip-build"
TARGET_SOURCE_PATH="/var/source"
VERSION=$(cat "${here}/images/${IMAGE}/version")

docker run --rm -w $TARGET_SOURCE_PATH -v ${PWD}:$TARGET_SOURCE_PATH "$ORGANIZATION/$IMAGE:$VERSION" ./integrations/docker/run_build.sh
docker run --rm -w "${SOURCE_PATH}" -v "${SOURCE_PATH}:${SOURCE_PATH}" "${ORGANIZATION}/${IMAGE}:${VERSION}" integrations/docker/run_build.sh "${@:-distcheck}"

0 comments on commit bacbce7

Please sign in to comment.