aboutsummaryrefslogtreecommitdiff
path: root/docker/elasticsearch
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-01-17 14:27:12 +0000
committerGerrit Code Review <review@openstack.org>2017-01-17 14:27:13 +0000
commitbe9a8789a698b45f9eb423c599fc603b80472bc9 (patch)
tree0689a24a8738d770a1269f7da9c0a74005a11097 /docker/elasticsearch
parent29642a8fcaebef4e60edfda040a0bf83e1d1f3a0 (diff)
parent58eee09c15dea81ec51bb366af23681de70ceaa1 (diff)
downloadkolla-be9a8789a698b45f9eb423c599fc603b80472bc9.tar.gz
kolla-be9a8789a698b45f9eb423c599fc603b80472bc9.zip
Merge "use static uid/gid in images"
Diffstat (limited to 'docker/elasticsearch')
-rw-r--r--docker/elasticsearch/Dockerfile.j26
1 files changed, 3 insertions, 3 deletions
diff --git a/docker/elasticsearch/Dockerfile.j2 b/docker/elasticsearch/Dockerfile.j2
index 7b24f330e..df1722290 100644
--- a/docker/elasticsearch/Dockerfile.j2
+++ b/docker/elasticsearch/Dockerfile.j2
@@ -5,6 +5,8 @@ MAINTAINER {{ maintainer }}
{% import "macros.j2" as macros with context %}
+{{ macros.configure_user(name='elasticsearch', shell='/bin/bash', homedir='/usr/share/elasticsearch') }}
+
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% set elasticsearch_packages = [
'java-1.7.0-openjdk',
@@ -34,9 +36,7 @@ COPY extend_start.sh /usr/local/bin/kolla_extend_start
RUN chmod 755 /usr/local/bin/kolla_extend_start \
&& chmod 750 /etc/sudoers.d \
- && chmod 440 /etc/sudoers.d/kolla_elasticsearch_sudoers \
- && usermod -a -G kolla elasticsearch \
- && usermod -s /bin/bash elasticsearch -d /usr/share/elasticsearch
+ && chmod 440 /etc/sudoers.d/kolla_elasticsearch_sudoers
{% block elasticsearch_footer %}{% endblock %}
{% block footer %}{% endblock %}