Repository: incubator-senssoft Updated Branches: refs/heads/master 52ea840bd -> 109b14af2
fixed bugs in docker Project: http://git-wip-us.apache.org/repos/asf/incubator-senssoft/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-senssoft/commit/109b14af Tree: http://git-wip-us.apache.org/repos/asf/incubator-senssoft/tree/109b14af Diff: http://git-wip-us.apache.org/repos/asf/incubator-senssoft/diff/109b14af Branch: refs/heads/master Commit: 109b14af29344ebbbe9279627c859f7d59d3ab17 Parents: 52ea840 Author: msbeard <msbe...@apache.org> Authored: Thu Sep 21 13:55:50 2017 -0400 Committer: msbeard <msbe...@apache.org> Committed: Thu Sep 21 13:55:50 2017 -0400 ---------------------------------------------------------------------- docker/docker-compose.yml | 36 ++++++++++++++--------------- docker/logstash/templates/userale.json | 5 ++-- docker/tap/Dockerfile | 8 ++++--- 3 files changed, 25 insertions(+), 24 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-senssoft/blob/109b14af/docker/docker-compose.yml ---------------------------------------------------------------------- diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index 09580a7..fc14c1c 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -36,8 +36,8 @@ services: depends_on: - "userale-forwarder" command: python -m SimpleHTTPServer 8080 - networks: - - esnet + # networks: + # - esnet # ELK Stack @@ -61,8 +61,8 @@ services: - esdata1:/usr/share/elasticsearch/data ports: - 9200:9200 - networks: - - esnet + # networks: + # - esnet elasticsearch2: image: docker.elastic.co/elasticsearch/elasticsearch:5.5.0 @@ -81,8 +81,8 @@ services: mem_limit: 1g volumes: - esdata2:/usr/share/elasticsearch/data - networks: - - esnet + # networks: + # - esnet # Kibana kibana: @@ -97,8 +97,8 @@ services: environment: XPACK_MONITORING_ENABLED: "false" ELASTICSEARCH_URL: http://elasticsearch1:9200 - networks: - - esnet + # networks: + # - esnet # Logstash userale-forwarder: @@ -115,8 +115,8 @@ services: - "elasticsearch2" environment: XPACK_MONITORING_ENABLED: "false" - networks: - - esnet + # networks: + # - esnet # Distill distill: @@ -126,22 +126,22 @@ services: - 8090:8090 depends_on: - "elasticsearch1" - - "elasticsearch2" - networks: - - esnet + # networks: + # - esnet # TAP's Database db: - container_name: tap-db + container_name: senssoft-db build: ./db ports: - "5432:5432" # TAP tap: - container_name: tap-web + container_name: senssoft-tap build: ./tap - command: ["bash", "./wait-for-postgres.sh"] + # command: ["bash", "./wait-for-postgres.sh"] + command: bash -c "/usr/src/app/wait-for-postgres.sh" ports: - "8010:8010" depends_on: @@ -155,5 +155,5 @@ volumes: esdata2: driver: local -networks: - esnet: +# networks: +# esnet: http://git-wip-us.apache.org/repos/asf/incubator-senssoft/blob/109b14af/docker/logstash/templates/userale.json ---------------------------------------------------------------------- diff --git a/docker/logstash/templates/userale.json b/docker/logstash/templates/userale.json index 3d1c0a5..aed094f 100644 --- a/docker/logstash/templates/userale.json +++ b/docker/logstash/templates/userale.json @@ -67,8 +67,7 @@ }, "path": { - "type": "text", - "analyzer": "my_analyzer" + "type": "keyword" }, "details": { @@ -130,7 +129,7 @@ { "type": "keyword" }, - "session": + "sessionID": { "type": "keyword" }, http://git-wip-us.apache.org/repos/asf/incubator-senssoft/blob/109b14af/docker/tap/Dockerfile ---------------------------------------------------------------------- diff --git a/docker/tap/Dockerfile b/docker/tap/Dockerfile index 386d49c..f705fb3 100644 --- a/docker/tap/Dockerfile +++ b/docker/tap/Dockerfile @@ -22,7 +22,8 @@ RUN apt-get -yqq update && apt-get -yqq install \ sudo # Install NodeJS 4.x -RUN curl -sL https://deb.nodesource.com/setup_4.x | sudo -E bash - +#RUN curl -sL https://deb.nodesource.com/setup_4.x | sudo -E bash - +RUN curl -sL https://deb.nodesource.com/setup_6.x | sudo -E bash - RUN sudo -E apt-get -yqq install \ nodejs \ @@ -50,12 +51,13 @@ RUN npm install RUN pip install -r requirements.txt # Add application files -#ADD secrets/secret.py /usr/src/app/tap/settings +ADD secret.py /usr/src/app/tap/settings #ADD secrets/neon_counts.js /usr/src/app/public #ADD secrets/neon_graph.js /usr/src/app/public # Add startup script -ADD wait-for-postgres.sh /usr/src/app +#ADD wait-for-postgres.sh /usr/src/app +RUN chmod +x /usr/src/app/wait-for-postgres.sh # Startup Application RUN gulp build
