aboutsummaryrefslogtreecommitdiff
path: root/docker/elasticsearch
diff options
context:
space:
mode:
authorZuul <zuul@review.opendev.org>2022-04-22 08:46:55 +0000
committerGerrit Code Review <review@openstack.org>2022-04-22 08:46:55 +0000
commit7cb4f7d01c5e61ebd5f324822e41910564d5563f (patch)
tree0991b7f2611dee2380df9cbe203df436f07c4be2 /docker/elasticsearch
parent8650c57c12498c483445536af5b5a85ada87791e (diff)
parente21aeb5ae955671937055baf57836120af8d4312 (diff)
downloadkolla-7cb4f7d01c5e61ebd5f324822e41910564d5563f.tar.gz
kolla-7cb4f7d01c5e61ebd5f324822e41910564d5563f.zip
Merge "flatten images a bit"
Diffstat (limited to 'docker/elasticsearch')
-rw-r--r--docker/elasticsearch/elasticsearch-curator/Dockerfile.j28
1 files changed, 4 insertions, 4 deletions
diff --git a/docker/elasticsearch/elasticsearch-curator/Dockerfile.j2 b/docker/elasticsearch/elasticsearch-curator/Dockerfile.j2
index 0ce0927a9..98a37b3ff 100644
--- a/docker/elasticsearch/elasticsearch-curator/Dockerfile.j2
+++ b/docker/elasticsearch/elasticsearch-curator/Dockerfile.j2
@@ -30,13 +30,13 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
'elasticsearch-curator'
] %}
+COPY extend_start.sh /usr/local/bin/kolla_extend_start
+
RUN {{ macros.install_pip(['pip', 'wheel', 'setuptools'], 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
-
-COPY extend_start.sh /usr/local/bin/kolla_extend_start
-RUN chmod 644 /usr/local/bin/kolla_extend_start
+ && chown -R elasticsearch: /etc/elasticsearch-curator \
+ && chmod 644 /usr/local/bin/kolla_extend_start
{% block elasticsearch_curator_base_footer %}{% endblock %}
{% block footer %}{% endblock %}