Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Improve speed and stability of CI builds #3162

Merged
merged 1 commit into from
Dec 12, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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 <ruflin@elastic.co>

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 <ruflin@elastic.co>

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 <ruflin@elastic.co>
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