From 50485bedfd9818165aa1d039d0abe95a559134b7 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Fri, 8 Feb 2019 08:31:03 +0100
Subject: Merging upstream version 1.12.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 build/build.sh | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

(limited to 'build/build.sh')

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
-- 
cgit v1.2.3