Skip to content

Commit f834290

Browse files
committed
curator: Add wheel to elasticsearch-curator
boto part cherry picked from change [1]. [1]: https://review.opendev.org/755339/ Change-Id: Idf980eedcd318b88101b3a82442b9b99838fd84c (cherry picked from commit 34460d6)
1 parent 579a3eb commit f834290

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

docker/elasticsearch/elasticsearch-curator/Dockerfile.j2

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
1111
{% set elasticsearch_curator_packages = [
1212
'cronie',
1313
'python3-pip',
14+
'python3-wheel'
1415
] %}
1516
{% elif base_package_type == 'deb' %}
1617
{% set elasticsearch_curator_packages = [
@@ -29,7 +30,9 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
2930
'elasticsearch-curator'
3031
] %}
3132

32-
RUN {{ macros.install_pip(elasticsearch_curator_pip_packages | customizable("pip_packages"), constraints=false) }} \
33+
{# FIXME: Revert the boto installations once we figure this issue out #}
34+
RUN {{ macros.install_pip(['"boto3<1.16"', '"botocore<1.19"'], constraints=false) }} \
35+
&& {{ macros.install_pip(elasticsearch_curator_pip_packages | customizable("pip_packages"), constraints=false) }} \
3336
&& mkdir -p /etc/elasticsearch-curator \
3437
&& chown -R elasticsearch: /etc/elasticsearch-curator
3538

0 commit comments

Comments
 (0)