Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Groom docker_build.sh #318

Merged
merged 2 commits into from
Apr 9, 2020
Merged

Groom docker_build.sh #318

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0ae1a38
Groom docker_build.sh
Apr 9, 2020
ca74a57
more grooming, remove obsolete
Apr 9, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 0 additions & 8 deletions integrations/docker/docker_build.sh
View file
Open in desktop

This file was deleted.

5 changes: 2 additions & 3 deletions integrations/docker/run_build.sh
View file
Open in desktop
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
View file
Open in desktop
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}"