Skip to content

Commit 81220c3

Browse files
Prepare 0.22.1
1 parent 8a4531a commit 81220c3

File tree

4 files changed

+33
-2
lines changed

4 files changed

+33
-2
lines changed

CHANGELOG.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ are used for versioning (schema follows below):
1717

1818
0.22.1
1919
----
20-
2021-04-29
20+
2021-05-01
2121

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

docker-compose-es-7-12.yml

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
version: '3'
2+
3+
services:
4+
5+
elasticsearch:
6+
container_name: django_elasticsearch_dsl_drf_elasticsearch_es_7_12
7+
build:
8+
context: .
9+
dockerfile: ./docker/elasticsearch/Dockerfile-ES-7-12
10+
image: docker.elastic.co/elasticsearch/elasticsearch:7.12.1
11+
volumes:
12+
- esdata712:/usr/share/elasticsearch/data
13+
ports:
14+
- "9200:9200"
15+
- "9300:9300"
16+
environment:
17+
# - bootstrap.memory_lock=true
18+
- discovery.type=single-node
19+
- xpack.security.enabled=false
20+
- cluster.routing.allocation.disk.watermark.low=97%
21+
- cluster.routing.allocation.disk.watermark.high=98%
22+
- cluster.routing.allocation.disk.watermark.flood_stage=99%
23+
- "ES_JAVA_OPTS=-Xms512m -Xmx512m"
24+
25+
volumes:
26+
esdata712:
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
FROM docker.elastic.co/elasticsearch/elasticsearch:7.12.1
2+
ADD ./docker/elasticsearch/elasticsearch.yml /usr/share/elasticsearch/config/
3+
USER root
4+
RUN chown elasticsearch:elasticsearch config/elasticsearch.yml
5+
USER elasticsearch

docs/changelog.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ are used for versioning (schema follows below):
1717

1818
0.22.1
1919
----
20-
2021-04-29
20+
2021-05-01
2121

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

0 commit comments

Comments
 (0)