Skip to content

Commit

Permalink
Merge pull request #2334 from zebrunner/develop
Browse files Browse the repository at this point in the history
  • Loading branch information
vdelendik authored Dec 15, 2021
2 parents 4a10377 + c2456e3 commit 56980be
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 1 deletion.
2 changes: 1 addition & 1 deletion .env.original
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
TAG_REPORTING_UI=1.26.0
TAG_REPORTING_SERVICE=1.26.1
TAG_REPORTING_SERVICE=1.26.2
TAG_ARTIFACTS_PROXY_SERVICE=1.8.0
TAG_MAIL_SERVICE=1.5
TAG_IAM_SERVICE=1.15.0
Expand Down
3 changes: 3 additions & 0 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@ services:
- "./configuration/elasticsearch/elasticsearch.yml:/usr/share/elasticsearch/config/elasticsearch.yml:ro"
environment:
- bootstrap.memory_lock=true
- LOG4J_FORMAT_MSG_NO_LOOKUPS=true
ulimits:
memlock:
soft: -1
Expand All @@ -84,6 +85,8 @@ services:
- "./configuration/logstash/logstash.conf:/usr/share/logstash/pipeline/logstash.conf:ro"
- "./configuration/logstash/mapping.json:/mapping.json:ro"
- "./configuration/logstash/test-run-data-template.json:/test-run-data-template.json:ro"
environment:
- LOG4J_FORMAT_MSG_NO_LOOKUPS=true
depends_on:
- rabbitmq
- elasticsearch
Expand Down

0 comments on commit 56980be

Please sign in to comment.