Merge pull request #2055 from matburt/remove_logstash

Remove the logstash container from the base dev docker compose
This commit is contained in:
Matthew Jones 2018-06-05 09:55:48 -04:00 committed by GitHub
commit ba997f924e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 9 deletions

View File

@ -73,7 +73,3 @@ services:
image: postgres:9.6
memcached:
image: memcached:alpine
logstash:
build:
context: ./docker-compose
dockerfile: Dockerfile-logstash

View File

@ -22,17 +22,18 @@ services:
- postgres
- memcached
- rabbitmq
- logstash
# - sync
# volumes_from:
# - sync
volumes:
- "../:/awx_devel"
privileged: true
logstash:
build:
context: ./docker-compose
dockerfile: Dockerfile-logstash
# A useful container that simply passes through log messages to the console
# helpful for testing awx/tower logging
# logstash:
# build:
# context: ./docker-compose
# dockerfile: Dockerfile-logstash
# Postgres Database Container
postgres:
image: postgres:9.6