openstack
/
kolla
Code Issues Proposed changes

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 34460d636e)
This commit is contained in:
Michal Nasiadka 2020-11-04 16:25:39 +00:00
parent 579a3ebde4
commit f834290de4
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
docker/elasticsearch/elasticsearch-curator/Dockerfile.j2
View File

@ -11,6 +11,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% set elasticsearch_curator_packages = [
'cronie',
'python3-pip',
'python3-wheel'
] %}
{% elif base_package_type == 'deb' %}
{% set elasticsearch_curator_packages = [
@ -29,7 +30,9 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
'elasticsearch-curator'
] %}
RUN {{ macros.install_pip(elasticsearch_curator_pip_packages | customizable("pip_packages"), constraints=false) }} \
{# FIXME: Revert the boto installations once we figure this issue out #}
RUN {{ macros.install_pip(['"boto3<1.16"', '"botocore<1.19"'], constraints=false) }} \
&& {{ macros.install_pip(elasticsearch_curator_pip_packages | customizable("pip_packages"), constraints=false) }} \
&& mkdir -p /etc/elasticsearch-curator \
&& chown -R elasticsearch: /etc/elasticsearch-curator