aboutsummaryrefslogtreecommitdiff
path: root/docker/zaqar
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/zaqar
parent29642a8fcaebef4e60edfda040a0bf83e1d1f3a0 (diff)
parent58eee09c15dea81ec51bb366af23681de70ceaa1 (diff)
downloadkolla-be9a8789a698b45f9eb423c599fc603b80472bc9.tar.gz
kolla-be9a8789a698b45f9eb423c599fc603b80472bc9.zip
Merge "use static uid/gid in images"
Diffstat (limited to 'docker/zaqar')
-rwxr-xr-xdocker/zaqar/Dockerfile.j26
1 files changed, 3 insertions, 3 deletions
diff --git a/docker/zaqar/Dockerfile.j2 b/docker/zaqar/Dockerfile.j2
index 8fc42df28..13613a248 100755
--- a/docker/zaqar/Dockerfile.j2
+++ b/docker/zaqar/Dockerfile.j2
@@ -5,6 +5,8 @@ MAINTAINER {{ maintainer }}
{% import "macros.j2" as macros with context %}
+{{ macros.configure_user(name='zaqar') }}
+
{% if install_type == 'binary' %}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
@@ -20,7 +22,6 @@ MAINTAINER {{ maintainer }}
{% elif install_type == 'source' %}
ADD zaqar-archive /zaqar-source
RUN ln -s zaqar-source/* zaqar \
- && useradd --user-group --create-home --home-dir /var/lib/zaqar zaqar \
&& /var/lib/kolla/venv/bin/pip --no-cache-dir install --upgrade -c requirements/upper-constraints.txt pymongo /zaqar \
&& mkdir -p /etc/zaqar \
&& cp -r /zaqar/etc/* /etc/zaqar/ \
@@ -30,8 +31,7 @@ RUN ln -s zaqar-source/* zaqar \
{% endif %}
COPY extend_start.sh /usr/local/bin/kolla_extend_start
-RUN chmod 755 /usr/local/bin/kolla_extend_start \
- && usermod -a -G kolla zaqar
+RUN chmod 755 /usr/local/bin/kolla_extend_start
{% block zaqar_footer %}{% endblock %}
{% block footer %}{% endblock %}