diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2019-02-08 07:31:03 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2019-02-08 07:31:03 +0000 |
| commit | 50485bedfd9818165aa1d039d0abe95a559134b7 (patch) | |
| tree | 79c7b08f67edcfb0c936e7a22931653b91189b9f /build/build.sh | |
| parent | Releasing debian version 1.11.1+dfsg-7. (diff) | |
| download | netdata-50485bedfd9818165aa1d039d0abe95a559134b7.tar.xz netdata-50485bedfd9818165aa1d039d0abe95a559134b7.zip | |
Merging upstream version 1.12.0.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'build/build.sh')
| -rwxr-xr-x | build/build.sh | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/build/build.sh b/build/build.sh index ee087b98f..892a7da98 100755 --- a/build/build.sh +++ b/build/build.sh @@ -1,7 +1,8 @@ #!/bin/bash -if [ -f build.sh ]; then - cd ../ || exit 1 +if [ ! -f .gitignore ]; then + echo "Run as ./travis/$(basename "$0") from top level directory of git repository" + exit 1 fi if [ "$IS_CONTAINER" != "" ]; then @@ -10,13 +11,10 @@ if [ "$IS_CONTAINER" != "" ]; then make dist rm -rf autom4te.cache else - if [[ "$(docker images -q netdata-gcc-builder:latest 2> /dev/null)" == "" ]]; then - docker build -t netdata-gcc-builder:latest -f build/Dockerfile . - fi docker run --rm -it \ --env IS_CONTAINER=TRUE \ --volume "${PWD}:/project:Z" \ --workdir "/project" \ - netdata:gcc \ - ./.travis/build.sh + netdata/builder:gcc \ + ./build/build.sh fi |