diff --git a/deps/elasticsearch/Dockerfile b/deps/elasticsearch/Dockerfile index 38151c38d..fdd2c8e02 100644 --- a/deps/elasticsearch/Dockerfile +++ b/deps/elasticsearch/Dockerfile @@ -1,4 +1,4 @@ -FROM docker.elastic.co/elasticsearch/elasticsearch:7.15.0 +FROM docker.elastic.co/elasticsearch/elasticsearch:8.11.3 RUN mkdir -p /usr/share/elasticsearch/config/analysis && curl -o /usr/share/elasticsearch/config/analysis/de_DR.xml "https://raw.githubusercontent.com/uschindler/german-decompounder/master/de_DR.xml" RUN mkdir -p /usr/share/elasticsearch/config/analysis && curl -o /usr/share/elasticsearch/config/analysis/dictionary-de.txt "https://raw.githubusercontent.com/uschindler/german-decompounder/master/dictionary-de.txt" diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml index f71d12e5b..3fac0af20 100644 --- a/docker-compose.dev.yml +++ b/docker-compose.dev.yml @@ -23,6 +23,7 @@ services: - "cluster.routing.allocation.disk.watermark.low=3gb" - "cluster.routing.allocation.disk.watermark.high=2gb" - "cluster.routing.allocation.disk.watermark.flood_stage=1gb" + - "xpack.security.enabled=false" ports: - "127.0.0.1:9200:9200" volumes: diff --git a/requirements-dev.txt b/requirements-dev.txt index af7cc24f8..131264c83 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -103,7 +103,7 @@ celery==5.2.7 # froide certifi==2023.7.22 # via - # elasticsearch + # elastic-transport # requests # sentry-sdk cffi==1.15.1 @@ -263,8 +263,10 @@ django-crossdomainmedia==0.0.4 # froide django-debug-toolbar==4.1.0 # via -r requirements-dev.in -django-elasticsearch-dsl==7.3 - # via froide +django-elasticsearch-dsl==8.0 + # via + # -r requirements.in + # froide django-entangled==0.5.4 # via djangocms-frontend django-filer==2.2.4 @@ -409,11 +411,13 @@ easy-thumbnails[svg]==2.8.5 # djangocms-frontend # djangocms-picture # froide -elasticsearch==7.17.9 +elastic-transport==8.11.0 + # via elasticsearch +elasticsearch==8.11.1 # via # -r requirements.in # elasticsearch-dsl -elasticsearch-dsl==7.4.1 +elasticsearch-dsl==8.11.0 # via # -r requirements.in # django-elasticsearch-dsl @@ -788,7 +792,6 @@ six==1.16.0 # click-repl # django-elasticsearch-dsl # djangorestframework-csv - # elasticsearch-dsl # geocoder # html5lib # python-dateutil @@ -874,7 +877,7 @@ uritemplate==4.1.1 # drf-spectacular urllib3==1.26.16 # via - # elasticsearch + # elastic-transport # requests # sentry-sdk vine==5.0.0 diff --git a/requirements-production.txt b/requirements-production.txt index 462649ecd..9fc979968 100644 --- a/requirements-production.txt +++ b/requirements-production.txt @@ -98,7 +98,7 @@ celery==5.2.7 # froide certifi==2023.7.22 # via - # elasticsearch + # elastic-transport # requests # sentry-sdk cffi==1.15.1 @@ -246,8 +246,10 @@ django-crossdomainmedia==0.0.4 # via # -r requirements.in # froide -django-elasticsearch-dsl==7.3 - # via froide +django-elasticsearch-dsl==8.0 + # via + # -r requirements.in + # froide django-entangled==0.5.4 # via djangocms-frontend django-filer==2.2.4 @@ -390,11 +392,13 @@ easy-thumbnails[svg]==2.8.5 # djangocms-frontend # djangocms-picture # froide -elasticsearch==7.17.9 +elastic-transport==8.11.0 + # via elasticsearch +elasticsearch==8.11.1 # via # -r requirements.in # elasticsearch-dsl -elasticsearch-dsl==7.4.1 +elasticsearch-dsl==8.11.0 # via # -r requirements.in # django-elasticsearch-dsl @@ -699,7 +703,6 @@ six==1.16.0 # click-repl # django-elasticsearch-dsl # djangorestframework-csv - # elasticsearch-dsl # geocoder # google-auth # google-auth-httplib2 @@ -755,7 +758,7 @@ uritemplate==4.1.1 # google-api-python-client urllib3==1.26.16 # via - # elasticsearch + # elastic-transport # google-auth # requests # sentry-sdk diff --git a/requirements.in b/requirements.in index bed3af9fb..39f1a3cc3 100644 --- a/requirements.in +++ b/requirements.in @@ -12,6 +12,7 @@ django-configurations django-contractor django-contrib-comments django-crossdomainmedia +django-elasticsearch-dsl>=8.0,<9.0 django-filer>=2.2.4 django-filingcabinet django-filter @@ -37,8 +38,8 @@ djangocms-video djangorestframework>=3.14.0 djangorestframework-csv djangorestframework-jsonp -elasticsearch-dsl>=7.0.0<8.0.0 -elasticsearch<8.0.0,>=7.0.0 +elasticsearch-dsl>=8.0.0<9.0.0 +elasticsearch<9.0.0,>=8.0.0 geoip2 html-text icalendar diff --git a/requirements.txt b/requirements.txt index 494c649b9..e953ed29c 100644 --- a/requirements.txt +++ b/requirements.txt @@ -93,7 +93,7 @@ celery==5.2.7 # froide certifi==2023.7.22 # via - # elasticsearch + # elastic-transport # requests # sentry-sdk cffi==1.15.1 @@ -236,8 +236,10 @@ django-crossdomainmedia==0.0.4 # via # -r requirements.in # froide -django-elasticsearch-dsl==7.3 - # via froide +django-elasticsearch-dsl==8.0 + # via + # -r requirements.in + # froide django-entangled==0.5.4 # via djangocms-frontend django-filer==2.2.4 @@ -380,11 +382,13 @@ easy-thumbnails[svg]==2.8.5 # djangocms-frontend # djangocms-picture # froide -elasticsearch==7.17.9 +elastic-transport==8.11.0 + # via elasticsearch +elasticsearch==8.11.1 # via # -r requirements.in # elasticsearch-dsl -elasticsearch-dsl==7.4.1 +elasticsearch-dsl==8.11.0 # via # -r requirements.in # django-elasticsearch-dsl @@ -642,7 +646,6 @@ six==1.16.0 # click-repl # django-elasticsearch-dsl # djangorestframework-csv - # elasticsearch-dsl # geocoder # html5lib # python-dateutil @@ -695,7 +698,7 @@ uritemplate==4.1.1 # drf-spectacular urllib3==1.26.16 # via - # elasticsearch + # elastic-transport # requests # sentry-sdk vine==5.0.0