diff options
| author | Michal Nasiadka <mnasiadka@gmail.com> | 2020-11-04 16:25:39 +0000 |
|---|---|---|
| committer | Michal Nasiadka <mnasiadka@gmail.com> | 2020-11-06 13:19:58 +0000 |
| commit | b3462dee0583b76ba3ec83a579072cf6e452cac2 (patch) | |
| tree | 916bfda3b44470b6ceeb0ade113b375dd803058b /docker | |
| parent | 4e9b17bf87e2efc205c31204c69248f3519602d8 (diff) | |
| download | kolla-b3462dee0583b76ba3ec83a579072cf6e452cac2.tar.gz kolla-b3462dee0583b76ba3ec83a579072cf6e452cac2.zip | |
curator: Add wheel to elasticsearch-curator
boto part cherry picked from change [1].
Disabling mongodb build due to missing packages in CentOS repos.
[1]: https://review.opendev.org/755339/
Change-Id: Idf980eedcd318b88101b3a82442b9b99838fd84c
(cherry picked from commit 34460d636e9e62f30a0d17eda2d743658ccb0b33)
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/elasticsearch/elasticsearch-curator/Dockerfile.j2 | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/docker/elasticsearch/elasticsearch-curator/Dockerfile.j2 b/docker/elasticsearch/elasticsearch-curator/Dockerfile.j2 index 7497163bc..e22da7832 100644 --- a/docker/elasticsearch/elasticsearch-curator/Dockerfile.j2 +++ b/docker/elasticsearch/elasticsearch-curator/Dockerfile.j2 @@ -9,6 +9,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 = [ @@ -26,7 +27,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, pip_version="pip3") }} \ +{# 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") }} \ && mkdir -p /etc/elasticsearch-curator \ && chown -R elasticsearch: /etc/elasticsearch-curator |