openstack
/
kolla
Code Issues Proposed changes

Merge "elasticsearch-curator: drop botocore workaround" into stable/train

This commit is contained in:
Zuul 2020-12-17 20:23:14 +00:00 committed by Gerrit Code Review
parent 617421fb38 a5a422f635
commit 02e5389da5
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -27,9 +27,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
'elasticsearch-curator'
] %}
{# FIXME: Revert the boto installations once we figure this issue out #}
RUN {{ macros.install_pip(['"boto3<1.16"', '"botocore<1.19"'], constraints=false, pip_version="pip3") }} \
&& {{ macros.install_pip(elasticsearch_curator_pip_packages | customizable("pip_packages"), constraints=false, pip_version="pip3") }} \
RUN {{ macros.install_pip(elasticsearch_curator_pip_packages | customizable("pip_packages"), constraints=false, pip_version="pip3") }} \
&& mkdir -p /etc/elasticsearch-curator \
&& chown -R elasticsearch: /etc/elasticsearch-curator