Skip to content

Commit

Permalink
Upgrade docker-compose ElasticSearch to 7.16.2 (#95)
Browse files Browse the repository at this point in the history
* Upgrade docker-compose ElasticSearch to 7.16.2

* Update Spring properties to suppress warnings

These properties were added to suppress ElasticSearch RestClient
warnings after upgrading ElasticSearch to 7.16.2 for log4j
vulnerabilities. We would expect them to be removed after
upgrading Spring Boot and associated API dependencies.
  • Loading branch information
JohnKallies committed Dec 28, 2021
1 parent a560f9f commit 1ae5225
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 2 deletions.
5 changes: 5 additions & 0 deletions api/src/main/resources/config/application-test.properties
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
# This property was added to suppress ElasticSearch RestClient warnings after upgrading
# ElasticSearch to 7.16.2 for log4j vulnerabilities. We would expect this property to be
# removed after upgrading Spring Boot and associated API dependencies.
logging.level.org.elasticsearch.client.RestClient=DEBUG

spring.flyway.enabled=true

app.whiteLabelEnabled=true
5 changes: 5 additions & 0 deletions api/src/main/resources/config/application.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
#logging.level.org.springframework=DEBUG

# This property was added to suppress ElasticSearch RestClient warnings after upgrading
# ElasticSearch to 7.16.2 for log4j vulnerabilities. We would expect this property to be
# removed after upgrading Spring Boot and associated API dependencies.
logging.level.org.elasticsearch.client.RestClient=DEBUG

# Database settings
db.name=${DB_NAME:osmt_db}
db.user=${DB_USER:osmt_db_user}
Expand Down
2 changes: 1 addition & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ services:
- osmt

elasticsearch:
image: docker.elastic.co/elasticsearch/elasticsearch:7.9.2
image: docker.elastic.co/elasticsearch/elasticsearch:7.16.2
volumes:
- elastic_data:/usr/share/elasticsearch/data
environment:
Expand Down
2 changes: 1 addition & 1 deletion docker/dev-stack.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ services:
networks:
- osmt
elasticsearch:
image: docker.elastic.co/elasticsearch/elasticsearch:7.9.2
image: docker.elastic.co/elasticsearch/elasticsearch:7.16.2
volumes:
- elastic_data:/usr/share/elasticsearch/data
environment:
Expand Down

0 comments on commit 1ae5225

Please sign in to comment.