move build Dockerfiles to external repo (#4749)
Paweł Krupa committed
Nov 26, 2018 at 15:54 UTC
85a55e76d5e135dabb74689658d7893177b1949c
8 files changed
+10
-35
.travis/README.md
+3
@@ -29,6 +29,9 @@ installations of netdata. Jobs are run on following operating systems:
29
- CentOS 7 (containerized)
30
- alpine (containerized)
31
32
+Images for system containers are stored on dockerhub and are created from Dockerfiles located in
33
+[netdata/helper-images](https://github.com/netdata/helper-images) repository.
34
+
35
### Packaging
36
37
This stage is executed only on "master" brach and allows us to create a new tag just looking at git commit message.
.travis/containerized_build.sh
+6
-2
@@ -2,6 +2,10 @@
2
3
set -e
4
5
-docker build -t dev-image -f ".travis/images/Dockerfile.$1" .
5
+if [ ! -f .gitignore ]
6
+then
7
+ echo "Run as ./travis/$(basename "$0") from top level directory of git repository"
8
+ exit 1
9
+fi
10
7
-docker run -it -w /code dev-image ./netdata-installer.sh --dont-wait --dont-start-it --install /tmp
11
+docker run -it -v "${PWD}:/code:rw" -w /code "netdata/os-test:$1" ./netdata-installer.sh --dont-wait --dont-start-it --install /tmp
.travis/images/Dockerfile.alpine
deleted
-5
@@ -1,5 +0,0 @@
1
-FROM alpine:latest
2
-
3
-RUN apk add bash gcc make autoconf automake pkgconfig zlib-dev libuuid git libmnl-dev util-linux-dev build-base
4
-
5
-COPY . /code
.travis/images/Dockerfile.centos6
deleted
-5
@@ -1,5 +0,0 @@
1
-FROM centos:6
2
-
3
-RUN yum install -y gcc make autoconf automake pkg-config zlib-devel libuuid-devel git
4
-
5
-COPY . /code
.travis/images/Dockerfile.centos7
deleted
-5
@@ -1,5 +0,0 @@
1
-FROM centos:7
2
-
3
-RUN yum install -y gcc make autoconf automake pkg-config zlib-devel libuuid-devel git
4
-
5
-COPY . /code
.travis/images/Dockerfile.ubuntu1804
deleted
-6
@@ -1,6 +0,0 @@
1
-FROM ubuntu:18.04
2
-
3
-RUN apt-get update && \
4
- apt-get install -y gcc make autoconf automake pkg-config zlib1g-dev uuid-dev git
5
-
6
-COPY . /code
build/Dockerfile
deleted
-8
@@ -1,8 +0,0 @@
1
-FROM gcc:8
2
-
3
-RUN apt-get update && apt-get install -y \
4
- autoconf-archive \
5
- autogen \
6
- libmnl-dev \
7
- uuid-dev \
8
- && rm -rf /var/lib/apt/lists/*
build/build.sh
+1
-4
@@ -10,13 +10,10 @@ if [ "$IS_CONTAINER" != "" ]; then
10
make dist
11
rm -rf autom4te.cache
12
else
13
- if [[ "$(docker images -q netdata-builder:latest 2> /dev/null)" == "" ]]; then
14
- docker build -t netdata-builder:latest -f build/Dockerfile .
15
- fi
13
docker run --rm -it \
14
--env IS_CONTAINER=TRUE \
15
--volume "${PWD}:/project:Z" \
16
--workdir "/project" \
20
- netdata-builder:latest \
17
+ netdata/builder:gcc \
18
./build/build.sh
19
fi