Skip to content

Commit

Permalink
Prepare 0.22.1
Browse files Browse the repository at this point in the history
  • Loading branch information
barseghyanartur committed May 1, 2021
1 parent 8a4531a commit 81220c3
Show file tree
Hide file tree
Showing 4 changed files with 33 additions and 2 deletions.
2 changes: 1 addition & 1 deletion CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ are used for versioning (schema follows below):

0.22.1
----
2021-04-29
2021-05-01

- `DictionaryProxy` gets an optional `meta` argument, which will hold meta
information of the hit.
Expand Down
26 changes: 26 additions & 0 deletions docker-compose-es-7-12.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
version: '3'

services:

elasticsearch:
container_name: django_elasticsearch_dsl_drf_elasticsearch_es_7_12
build:
context: .
dockerfile: ./docker/elasticsearch/Dockerfile-ES-7-12
image: docker.elastic.co/elasticsearch/elasticsearch:7.12.1
volumes:
- esdata712:/usr/share/elasticsearch/data
ports:
- "9200:9200"
- "9300:9300"
environment:
# - bootstrap.memory_lock=true
- discovery.type=single-node
- xpack.security.enabled=false
- cluster.routing.allocation.disk.watermark.low=97%
- cluster.routing.allocation.disk.watermark.high=98%
- cluster.routing.allocation.disk.watermark.flood_stage=99%
- "ES_JAVA_OPTS=-Xms512m -Xmx512m"

volumes:
esdata712:
5 changes: 5 additions & 0 deletions docker/elasticsearch/Dockerfile-ES-7-12
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
FROM docker.elastic.co/elasticsearch/elasticsearch:7.12.1
ADD ./docker/elasticsearch/elasticsearch.yml /usr/share/elasticsearch/config/
USER root
RUN chown elasticsearch:elasticsearch config/elasticsearch.yml
USER elasticsearch
2 changes: 1 addition & 1 deletion docs/changelog.rst
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ are used for versioning (schema follows below):

0.22.1
----
2021-04-29
2021-05-01

- `DictionaryProxy` gets an optional `meta` argument, which will hold meta
information of the hit.
Expand Down

0 comments on commit 81220c3

Please sign in to comment.