Skip to content

Commit

Permalink
Update ES stack
Browse files Browse the repository at this point in the history
  • Loading branch information
jorge07 committed Jul 2, 2018
1 parent 98d005b commit acf11c2
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 13 deletions.
6 changes: 3 additions & 3 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,14 +50,14 @@ services:
- "5672:5672"

kibana:
image: kibana:5.6
image: docker.elastic.co/kibana/kibana:6.3.0
ports:
- 5601:5601
volumes:
- "./etc/dev/kibana/config:/usr/share/kibana/config"
- "$PWD/etc/dev/kibana/config:/usr/share/kibana/config/kibana.yml"

elasticsearch:
image: elasticsearch:5.6
image: docker.elastic.co/elasticsearch/elasticsearch:6.3.0
ports:
- "9200:9200"

Expand Down
11 changes: 1 addition & 10 deletions etc/dev/kibana/config
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,4 @@ server.name: kibana
server.host: "0"
elasticsearch.url: http://elasticsearch:9200

## Disable X-Pack
## see https://www.elastic.co/guide/en/x-pack/current/xpack-settings.html
## https://www.elastic.co/guide/en/x-pack/current/installing-xpack.html#xpack-enabling
#
xpack.security.enabled: false
xpack.monitoring.enabled: false
xpack.ml.enabled: false
xpack.graph.enabled: false
xpack.reporting.enabled: false
xpack.grokdebugger.enabled: false
xpack.monitoring.ui.container.elasticsearch.enabled: true
4 changes: 4 additions & 0 deletions makefile
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,10 @@ build: ## build environment and initialize composer and project dependencies
docker-compose build
docker-compose run --rm php sh -lc 'composer install'

.PHONY: composer-update
composer-update: ## Update project dependencies
docker-compose run --rm php sh -lc 'composer update'

.PHONY: up
up: ## spin up environment
docker-compose up -d
Expand Down

0 comments on commit acf11c2

Please sign in to comment.