summaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2019-02-08 07:31:03 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2019-02-08 07:31:03 +0000
commit50485bedfd9818165aa1d039d0abe95a559134b7 (patch)
tree79c7b08f67edcfb0c936e7a22931653b91189b9f /build
parentReleasing debian version 1.11.1+dfsg-7. (diff)
downloadnetdata-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 '')
-rw-r--r--build/Dockerfile8
-rwxr-xr-xbuild/build.sh12
-rw-r--r--build/subst.inc4
3 files changed, 7 insertions, 17 deletions
diff --git a/build/Dockerfile b/build/Dockerfile
deleted file mode 100644
index 8a816b825..000000000
--- a/build/Dockerfile
+++ /dev/null
@@ -1,8 +0,0 @@
-FROM gcc:8
-
-RUN apt-get update && apt-get install -y \
- autoconf-archive \
- autogen \
- libmnl-dev \
- uuid-dev \
- && rm -rf /var/lib/apt/lists/*
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
diff --git a/build/subst.inc b/build/subst.inc
index 8f9ac0551..558d33adf 100644
--- a/build/subst.inc
+++ b/build/subst.inc
@@ -2,11 +2,11 @@
if sed \
-e 's#[@]localstatedir_POST@#$(localstatedir)#g' \
-e 's#[@]sbindir_POST@#$(sbindir)#g' \
- -e 's#[@]sysconfdir_POST@#$(sysconfdir)#g' \
- -e 's#[@]pythondir_POST@#$(pythondir)#g' \
-e 's#[@]configdir_POST@#$(configdir)#g' \
-e 's#[@]libconfigdir_POST@#$(libconfigdir)#g' \
-e 's#[@]cachedir_POST@#$(cachedir)#g' \
+ -e 's#[@]registrydir_POST@#$(registrydir)#g' \
+ -e 's#[@]varlibdir_POST@#$(varlibdir)#g' \
$< > $@.tmp; then \
mv "$@.tmp" "$@"; \
else \