aboutsummaryrefslogtreecommitdiff
path: root/docker/searchlight
diff options
context:
space:
mode:
Diffstat (limited to 'docker/searchlight')
-rw-r--r--docker/searchlight/searchlight-base/Dockerfile.j28
1 files changed, 5 insertions, 3 deletions
diff --git a/docker/searchlight/searchlight-base/Dockerfile.j2 b/docker/searchlight/searchlight-base/Dockerfile.j2
index 96eb27408..a82468608 100644
--- a/docker/searchlight/searchlight-base/Dockerfile.j2
+++ b/docker/searchlight/searchlight-base/Dockerfile.j2
@@ -3,6 +3,10 @@ MAINTAINER {{ maintainer }}
{% block searchlight_base_header %}{% endblock %}
+{% import "macros.j2" as macros with context %}
+
+{{ macros.configure_user(name='searchlight') }}
+
{% if install_type == 'binary' %}
RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
@@ -12,7 +16,6 @@ RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
ADD searchlight-base-archive /searchlight-base-source
RUN ln -s searchlight-base-source/* searchlight \
- && useradd --user-group searchlight \
&& /var/lib/kolla/venv/bin/pip --no-cache-dir install --upgrade -c requirements/upper-constraints.txt /searchlight \
&& mkdir -p /etc/searchlight \
&& cp -r /searchlight/etc/* /etc/searchlight \
@@ -22,8 +25,7 @@ RUN ln -s searchlight-base-source/* searchlight \
COPY extend_start.sh /usr/local/bin/kolla_extend_start
-RUN usermod -a -G kolla searchlight \
- && touch /usr/local/bin/kolla_searchlight_extend_start \
+RUN touch /usr/local/bin/kolla_searchlight_extend_start \
&& chmod 755 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_searchlight_extend_start
{% block searchlight_base_footer %}{% endblock %}