Skip to content

Commit

Permalink
Set ES_BEATS as environmennt variable for docker-compose (elastic#3299)
Browse files Browse the repository at this point in the history
This allows to use ES_BEATS path to link containers in community beats
  • Loading branch information
ruflin authored and tsg committed Jan 10, 2017
1 parent 3aad2d9 commit 4fcf6ee
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion libbeat/scripts/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ SYSTEM_TESTS?=false ## @testing if true, "make test" and "make testsuite" run un
GOX_OS?=linux darwin windows solaris freebsd netbsd openbsd ## @Building List of all OS to be supported by "make crosscompile".
TESTING_ENVIRONMENT?=snapshot ## @testing The name of the environment under test
DOCKER_COMPOSE_PROJECT_NAME?=${BEATNAME}_${TESTING_ENVIRONMENT} ## @testing The name of the docker-compose project used by the integration and system tests
DOCKER_COMPOSE?=TESTING_ENVIRONMENT=${TESTING_ENVIRONMENT} docker-compose -p ${DOCKER_COMPOSE_PROJECT_NAME} -f docker-compose.yml
DOCKER_COMPOSE?=TESTING_ENVIRONMENT=${TESTING_ENVIRONMENT} ES_BEATS=${ES_BEATS} docker-compose -p ${DOCKER_COMPOSE_PROJECT_NAME} -f docker-compose.yml
DOCKER_CACHE?=1 ## @miscellaneous If set to 0, all docker images are created without cache
GOPACKAGES_COMMA_SEP=$(subst $(space),$(comma),$(strip ${GOPACKAGES}))
PYTHON_ENV?=${BUILD_DIR}/python-env
Expand Down

0 comments on commit 4fcf6ee

Please sign in to comment.