Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade dependencies + Docker dev setup to ES 8 #449

Merged
merged 1 commit into from
Dec 19, 2023
Merged

Upgrade dependencies + Docker dev setup to ES 8 #449

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion deps/elasticsearch/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
1 change: 1 addition & 0 deletions docker-compose.dev.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
17 changes: 10 additions & 7 deletions requirements-dev.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ celery==5.2.7
# froide
certifi==2023.7.22
# via
# elasticsearch
# elastic-transport
# requests
# sentry-sdk
cffi==1.15.1
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -788,7 +792,6 @@ six==1.16.0
# click-repl
# django-elasticsearch-dsl
# djangorestframework-csv
# elasticsearch-dsl
# geocoder
# html5lib
# python-dateutil
Expand Down Expand Up @@ -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
Expand Down
17 changes: 10 additions & 7 deletions requirements-production.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ celery==5.2.7
# froide
certifi==2023.7.22
# via
# elasticsearch
# elastic-transport
# requests
# sentry-sdk
cffi==1.15.1
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -699,7 +703,6 @@ six==1.16.0
# click-repl
# django-elasticsearch-dsl
# djangorestframework-csv
# elasticsearch-dsl
# geocoder
# google-auth
# google-auth-httplib2
Expand Down Expand Up @@ -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
Expand Down
5 changes: 3 additions & 2 deletions requirements.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
17 changes: 10 additions & 7 deletions requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ celery==5.2.7
# froide
certifi==2023.7.22
# via
# elasticsearch
# elastic-transport
# requests
# sentry-sdk
cffi==1.15.1
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -642,7 +646,6 @@ six==1.16.0
# click-repl
# django-elasticsearch-dsl
# djangorestframework-csv
# elasticsearch-dsl
# geocoder
# html5lib
# python-dateutil
Expand Down Expand Up @@ -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
Expand Down