Commit 86134ff3 authored by Ignacio's avatar Ignacio
Browse files

Corrige merge en docker-compose

parent 1bbaff7b

deploy/docker-compose.tmpl.yml

+1 −9
Original line number Diff line number Diff line
@@ -15,12 +15,9 @@ services: 
      - XPACK_LOGSTASH_ENABLED=false

      - XPACK_MONITORING_ENABLED=false

      - ELASTICSEARCH_URL

<<<<<<< Updated upstream

      - ELASTICSEARCH_USERNAME

      - ELASTICSEARCH_PASSWORD

=======

      - VEGA_ENABLEEXTERNALURLS=true

>>>>>>> Stashed changes

    networks:

      - elastic-net

      - traefik-net
@@ -65,13 +62,8 @@ configs: 
  logtrail-json:

    name: ${LOGTRAIL_JSON_NAME:-logtrail-json}

    file: ./config/logtrail.json

<<<<<<< Updated upstream



  kibana-yml:

    name: ${KIBANA_YML_NAME:-kibana-yml}

    file: ./config/kibana.yml

=======

  kibana-yml:

    name: ${KIBANA_YML_NAME:-kibana-yml}

    file: ./config/kibana.yml

>>>>>>> Stashed changes