Cleanup Metricbeat composer and Makefile

This PR is a subset of elastic#5945 to remove the Metricbeat changes from the PR.

.travis.yml

@@ -50,7 +50,7 @@ jobs:
       go: $GO_VERSION
       stage: test
     - os: osx
-      env: TARGETS="-C auditbeat testsuite"
+      env: TARGETS="TEST_ENVIRONMENT=0 -C auditbeat testsuite"
       go: $GO_VERSION
       stage: test
     - os: linux

metricbeat/Makefile

@@ -1,13 +1,10 @@
-#!/bin/bash
-
 # Name can be overwritten, as Metricbeat is also a library
 BEAT_NAME?=metricbeat
 BEAT_TITLE?=Metricbeat
 BEAT_DESCRIPTION?=Metricbeat is a lightweight shipper for metrics.
 SYSTEM_TESTS?=true
 TEST_ENVIRONMENT?=true
 TESTING_ENVIRONMENT?=snapshot-noxpack
-GOPACKAGES=$(shell go list ${BEAT_PATH}/... | grep -v /vendor/)
 ES_BEATS?=..
 
 # Metricbeat can only be cross-compiled on platforms not requiring CGO.

metricbeat/docker-compose.yml

@@ -1,12 +1,12 @@
-version: '2'
+version: '2.1'
 services:
   beat:
-    build: .
+    build: ${PWD}/.
     environment:
       - TEST_ENVIRONMENT=false
     working_dir: /go/src/github.com/elastic/beats/metricbeat
     volumes:
-      - ./..:/go/src/github.com/elastic/beats/
+      - ${PWD}/..:/go/src/github.com/elastic/beats/
       # This is required to on-demand launching the rest on containers for tests & also docker module tests:
       - /var/run/docker.sock:/var/run/docker.sock
     command: make