summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaweł Krupa <pawel@krupa.net.pl>2018-11-26 15:54:22 +0200
committerGitHub <noreply@github.com>2018-11-26 15:54:22 +0200
commit85a55e76d5e135dabb74689658d7893177b1949c (patch)
tree895f8508cb4fb95d90892eb475f9ed1e93de756d
parent655c699e640fac5529821e19fbbbd9c5b4de402d (diff)
move build Dockerfiles to external repo (#4749)
-rw-r--r--.travis/README.md3
-rwxr-xr-x.travis/containerized_build.sh8
-rw-r--r--.travis/images/Dockerfile.alpine5
-rw-r--r--.travis/images/Dockerfile.centos65
-rw-r--r--.travis/images/Dockerfile.centos75
-rw-r--r--.travis/images/Dockerfile.ubuntu18046
-rw-r--r--build/Dockerfile8
-rwxr-xr-xbuild/build.sh5
8 files changed, 10 insertions, 35 deletions
diff --git a/.travis/README.md b/.travis/README.md
index e37e9feffb..977d1fbab4 100644
--- a/.travis/README.md
+++ b/.travis/README.md
@@ -29,6 +29,9 @@ installations of netdata. Jobs are run on following operating systems:
- CentOS 7 (containerized)
- alpine (containerized)
+Images for system containers are stored on dockerhub and are created from Dockerfiles located in
+[netdata/helper-images](https://github.com/netdata/helper-images) repository.
+
### Packaging
This stage is executed only on "master" brach and allows us to create a new tag just looking at git commit message.
diff --git a/.travis/containerized_build.sh b/.travis/containerized_build.sh
index 314a2ec392..f2d730176b 100755
--- a/.travis/containerized_build.sh
+++ b/.travis/containerized_build.sh
@@ -2,6 +2,10 @@
set -e
-docker build -t dev-image -f ".travis/images/Dockerfile.$1" .
+if [ ! -f .gitignore ]
+then
+ echo "Run as ./travis/$(basename "$0") from top level directory of git repository"
+ exit 1
+fi
-docker run -it -w /code dev-image ./netdata-installer.sh --dont-wait --dont-start-it --install /tmp
+docker run -it -v "${PWD}:/code:rw" -w /code "netdata/os-test:$1" ./netdata-installer.sh --dont-wait --dont-start-it --install /tmp
diff --git a/.travis/images/Dockerfile.alpine b/.travis/images/Dockerfile.alpine
deleted file mode 100644
index 15f527165f..0000000000
--- a/.travis/images/Dockerfile.alpine
+++ /dev/null
@@ -1,5 +0,0 @@
-FROM alpine:latest
-
-RUN apk add bash gcc make autoconf automake pkgconfig zlib-dev libuuid git libmnl-dev util-linux-dev build-base
-
-COPY . /code
diff --git a/.travis/images/Dockerfile.centos6 b/.travis/images/Dockerfile.centos6
deleted file mode 100644
index c286fb95c1..0000000000
--- a/.travis/images/Dockerfile.centos6
+++ /dev/null
@@ -1,5 +0,0 @@
-FROM centos:6
-
-RUN yum install -y gcc make autoconf automake pkg-config zlib-devel libuuid-devel git
-
-COPY . /code
diff --git a/.travis/images/Dockerfile.centos7 b/.travis/images/Dockerfile.centos7
deleted file mode 100644
index d94359dec0..0000000000
--- a/.travis/images/Dockerfile.centos7
+++ /dev/null
@@ -1,5 +0,0 @@
-FROM centos:7
-
-RUN yum install -y gcc make autoconf automake pkg-config zlib-devel libuuid-devel git
-
-COPY . /code
diff --git a/.travis/images/Dockerfile.ubuntu1804 b/.travis/images/Dockerfile.ubuntu1804
deleted file mode 100644
index 30ac7cf71e..0000000000
--- a/.travis/images/Dockerfile.ubuntu1804
+++ /dev/null
@@ -1,6 +0,0 @@
-FROM ubuntu:18.04
-
-RUN apt-get update && \
- apt-get install -y gcc make autoconf automake pkg-config zlib1g-dev uuid-dev git
-
-COPY . /code
diff --git a/build/Dockerfile b/build/Dockerfile
deleted file mode 100644
index 8a816b825c..0000000000
--- 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 1b1e1eecf1..8176190f67 100755
--- a/build/build.sh
+++ b/build/build.sh
@@ -10,13 +10,10 @@ if [ "$IS_CONTAINER" != "" ]; then
make dist
rm -rf autom4te.cache
else
- if [[ "$(docker images -q netdata-builder:latest 2> /dev/null)" == "" ]]; then
- docker build -t netdata-builder:latest -f build/Dockerfile .
- fi
docker run --rm -it \
--env IS_CONTAINER=TRUE \
--volume "${PWD}:/project:Z" \
--workdir "/project" \
- netdata-builder:latest \
+ netdata/builder:gcc \
./build/build.sh
fi