Skip to content

Commit

Permalink
Improve speed and stability of CI builds (#3162)
Browse files Browse the repository at this point in the history
Loading and creating docker images takes quite a bit of time on the travis builds. Especially calls like apt-get update and install take lots of time and bandwidth and fail from time to time, as a host is not available.

Following actions were taken:

* Fake Kibana container is now based on alpine
* Redis stunnel container was also switched to alpine
  • Loading branch information
ruflin authored and tsg committed Dec 12, 2016
1 parent 1ac7bf8 commit 7f2807b
Show file tree
Hide file tree
Showing 7 changed files with 9 additions and 17 deletions.
3 changes: 2 additions & 1 deletion libbeat/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@ MAINTAINER Nicolas Ruflin <[email protected]>

RUN set -x && \
apt-get update && \
apt-get install -y netcat python-virtualenv python-pip && \
apt-get install -y --no-install-recommends \
netcat python-pip virtualenv && \
apt-get clean

ENV PYTHON_ENV=/tmp/python-env
Expand Down
5 changes: 1 addition & 4 deletions libbeat/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,4 @@ services:

# Overloading kibana with a simple image as it is not needed here
kibana:
build:
context: ${PWD}/../testing/environments/
dockerfile: Dockerfile
args: []
image: alpine:latest
2 changes: 1 addition & 1 deletion libbeat/scripts/docker-entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ waitFor() {
done

echo
echo >&2 '${3} is not available'
echo >&2 "${3} is not available"
echo >&2 "Address: ${1}:${2}"
}

Expand Down
3 changes: 2 additions & 1 deletion metricbeat/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@ MAINTAINER Nicolas Ruflin <[email protected]>

RUN set -x && \
apt-get update && \
apt-get install -y netcat python-virtualenv python-pip && \
apt-get install -y --no-install-recommends \
netcat python-pip virtualenv && \
apt-get clean

# Setup work environment
Expand Down
4 changes: 1 addition & 3 deletions metricbeat/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,7 @@ services:

# Overloading kibana with a simple image as it is not needed here
kibana:
build:
context: ${PWD}/../testing/environments/
dockerfile: Dockerfile
image: alpine:latest

# Modules
apache:
Expand Down
3 changes: 0 additions & 3 deletions testing/environments/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,3 @@ MAINTAINER Nicolas Ruflin <[email protected]>
RUN apt-get update && \
apt-get install -y curl nano wget zip && \
apt-get clean


ARG KIBANA_VERSION
6 changes: 2 additions & 4 deletions testing/environments/docker/sredis/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
FROM debian:8.4
FROM alpine:edge

RUN apt-get update \
&& apt-get upgrade -y \
&& apt-get install stunnel4 -y
RUN apk add --no-cache stunnel

COPY stunnel.conf /etc/stunnel/stunnel.conf
COPY pki /etc/pki
Expand Down

0 comments on commit 7f2807b

Please sign in to comment.