From 0afb8e463899c444092a1a1682e072bb81ee162a Mon Sep 17 00:00:00 2001
From: ruflin <spam@ruflin.com>
Date: Thu, 7 Jan 2016 23:38:50 +0100
Subject: [PATCH] Move beat specific logic to docker-compose

---
 Dockerfile                 | 12 ------------
 libbeat/docker-compose.yml |  5 +++++
 2 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index f606c58d7b4e..99b5df5a77c3 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -17,22 +17,10 @@ RUN set -x \
 
 COPY scripts/docker-entrypoint.sh /entrypoint.sh
 
-# Setup work environment
-ENV LIBBEAT_PATH /go/src/github.com/elastic/beats/libbeat
 ENV GO15VENDOREXPERIMENT=1
-RUN mkdir -p $LIBBEAT_PATH/coverage
-WORKDIR $LIBBEAT_PATH
 
 RUN mkdir -p /etc/pki/tls/certs
 COPY scripts/docker/logstash/pki/tls/certs/logstash.crt /etc/pki/tls/certs/logstash.crt
 
 # Create a copy of the respository inside the container.
 COPY . /go/src/github.com/elastic/beats/
-
-# It is expected that libbeat from the host is mounted
-# within the container at the WORKDIR location.
-ENTRYPOINT ["/entrypoint.sh"]
-
-# Build libbeat inside of the container so that it is ready
-# for testing.
-RUN make
diff --git a/libbeat/docker-compose.yml b/libbeat/docker-compose.yml
index 8c99bd9fb4cc..caceab142e8b 100644
--- a/libbeat/docker-compose.yml
+++ b/libbeat/docker-compose.yml
@@ -12,8 +12,13 @@ libbeat:
     - LS_TLS_PORT=5055
     - ES_USER=beats
     - ES_PASS=testing
+    # Setup work environment
+    - LIBBEAT_PATH=/go/src/github.com/elastic/beats/libbeat
   env_file:
     - build/test.env
+  working_dir: /go/src/github.com/elastic/beats/libbeat
+  command: make
+  entrypoint: /entrypoint.sh
 elasticsearch:
   build: ../scripts/docker/elasticsearch
   dockerfile: Dockerfile-2.2.0