Updated port for logstash. Updated distill context. Added startup script for TAP
Project: http://git-wip-us.apache.org/repos/asf/incubator-senssoft/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-senssoft/commit/6b884a9a Tree: http://git-wip-us.apache.org/repos/asf/incubator-senssoft/tree/6b884a9a Diff: http://git-wip-us.apache.org/repos/asf/incubator-senssoft/diff/6b884a9a Branch: refs/heads/docker-build Commit: 6b884a9a66742db077372bd1f741b1b2ec6eec55 Parents: d8f0f7c Author: Rob Foley <rob.foley...@gmail.com> Authored: Wed Mar 22 17:17:40 2017 -0400 Committer: Rob Foley <rob.foley...@gmail.com> Committed: Wed Mar 22 17:17:40 2017 -0400 ---------------------------------------------------------------------- docker/docker-compose.yml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-senssoft/blob/6b884a9a/docker/docker-compose.yml ---------------------------------------------------------------------- diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index 97ee0cb..b1e552b 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -42,7 +42,7 @@ services: container_name: senssoft-userale-forwarder command: -f /etc/logstash/conf.d ports: - - 8000:8000 + - 8080:8080 volumes: - ./logstash/config/logstash-userale.conf:/etc/logstash/conf.d/logstash-userale.conf - ./logstash/templates/userale.json:/usr/share/logstash/templates/userale.json @@ -51,9 +51,7 @@ services: environment: LS_HEAP_SIZE: "2048m" distill: - build: - context: . - dockerfile: ./distill/Dockerfile + build: ./distill container_name: distill ports: - 8090:8090 @@ -69,7 +67,7 @@ services: tap: container_name: tap-web build: ./tap - command: bash -c "python manage.py migrate && python manage.py runserver 0.0.0.0:8000" + command: ["bash", "./wait-for-postgres.sh"] ports: - "8000:8000" depends_on:
