Skip to content

Instantly share code, notes, and snippets.

@anjia0532
Last active May 14, 2022 15:23
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save anjia0532/d8e779c97333d6fc0d045675e18e1224 to your computer and use it in GitHub Desktop.
Save anjia0532/d8e779c97333d6fc0d045675e18e1224 to your computer and use it in GitHub Desktop.
FROM python:3.9.4-alpine3.13
# Chinese mirror
#RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.ustc.edu.cn/g' /etc/apk/repositories && \
# pip install -i https://mirrors.ustc.edu.cn/pypi/web/simple pip -U && \
# pip config set global.index-url https://mirrors.ustc.edu.cn/pypi/web/simple
RUN apk --no-cache add --virtual .build-deps git && \
git clone https://github.com/elastic/curator.git /tmp/curator && \
cd /tmp/curator && \
git checkout -b tags/v5.8.4 && \
wget -O /tmp/curator.patch https://gist.githubusercontent.com/anjia0532/d8e779c97333d6fc0d045675e18e1224/raw/5de8de9fd634afbc1fdbaf077f2e9e0c97638b43/elastic-curator-support-es-8-x.patch && \
git apply --check /tmp/curator.patch && \
git apply /tmp/curator.patch && \
apk del .build-deps
RUN cd /tmp/curator && python setup.py install
# Thanks for @arslanbekov
RUN rm -rf /tmp/curator
Index: curator/_version.py
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/curator/_version.py b/curator/_version.py
--- a/curator/_version.py (revision 191de8cd0c7c719de6d5fca1f9fbbc8adfb5c006)
+++ b/curator/_version.py (revision caef1c9e29c67d534764ed25e4bf3f1ae70b6276)
@@ -1,2 +1,2 @@
"""Curator Version"""
-__version__ = '5.8.4'
+__version__ = '5.8.5'
Index: curator/defaults/settings.py
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/curator/defaults/settings.py b/curator/defaults/settings.py
--- a/curator/defaults/settings.py (revision 191de8cd0c7c719de6d5fca1f9fbbc8adfb5c006)
+++ b/curator/defaults/settings.py (revision caef1c9e29c67d534764ed25e4bf3f1ae70b6276)
@@ -6,7 +6,7 @@
# Elasticsearch versions supported
def version_max():
"""Return the maximum Elasticsearch version Curator supports"""
- return (7, 99, 99)
+ return (8, 99, 99)
def version_min():
"""Return the minimum Elasticsearch version Curator supports"""
return (5, 0, 0)
Index: requirements.txt
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/requirements.txt b/requirements.txt
--- a/requirements.txt (revision 191de8cd0c7c719de6d5fca1f9fbbc8adfb5c006)
+++ b/requirements.txt (revision caef1c9e29c67d534764ed25e4bf3f1ae70b6276)
@@ -1,10 +1,10 @@
voluptuous>=0.12.1
-elasticsearch>=7.14.0,<8.0.0
+elasticsearch>=7.14.0,<=9.0.0
urllib3>=1.26.5,<2
requests>=2.26.0
boto3>=1.18.18
requests_aws4auth>=1.1.1
-click>=7.0,<8.0
+click>=8.0.3,<9.0
pyyaml>=5.4.1
certifi>=2021.5.30
six>=1.16.0
Index: setup.py
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/setup.py b/setup.py
--- a/setup.py (revision 191de8cd0c7c719de6d5fca1f9fbbc8adfb5c006)
+++ b/setup.py (revision caef1c9e29c67d534764ed25e4bf3f1ae70b6276)
@@ -22,12 +22,13 @@
return VERSION
def get_install_requires():
- res = ['elasticsearch>=7.14.0,<8.0.0' ]
+ res = ['elasticsearch>=7.14.0,<=9.0.0' ]
+ res.append('voluptuous>=0.12.1')
res.append('urllib3>=1.26.5,<2')
res.append('requests>=2.26.0')
res.append('boto3>=1.18.18')
res.append('requests_aws4auth>=1.1.1')
- res.append('click>=7.0,<8.0')
+ res.append('click>=8.0.3,<9.0')
res.append('pyyaml==5.4.1')
res.append('voluptuous>=0.12.1')
res.append('certifi>=2021.5.30')
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment