From f834290de4046681410e7b781d0c5648e45e9ed1 Mon Sep 17 00:00:00 2001 From: Michal Nasiadka Date: Wed, 4 Nov 2020 16:25:39 +0000 Subject: [PATCH] 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 34460d636e9e62f30a0d17eda2d743658ccb0b33) --- docker/elasticsearch/elasticsearch-curator/Dockerfile.j2 | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/docker/elasticsearch/elasticsearch-curator/Dockerfile.j2 b/docker/elasticsearch/elasticsearch-curator/Dockerfile.j2 index b08035ad64..39a6aa7b97 100644 --- a/docker/elasticsearch/elasticsearch-curator/Dockerfile.j2 +++ b/docker/elasticsearch/elasticsearch-curator/Dockerfile.j2 @@ -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