diff options
Diffstat (limited to 'docker/rally')
| -rw-r--r-- | docker/rally/Dockerfile.j2 | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/docker/rally/Dockerfile.j2 b/docker/rally/Dockerfile.j2 index b51431d4d..8daf95e52 100644 --- a/docker/rally/Dockerfile.j2 +++ b/docker/rally/Dockerfile.j2 @@ -5,12 +5,12 @@ MAINTAINER {{ maintainer }} {% import "macros.j2" as macros with context %} +{{ macros.configure_user(name='rally') }} + {% if install_type == 'binary' %} {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} {% set rally_packages = ['openstack-rally'] %} -RUN useradd --user-group rally - {% elif base_distro in ['ubuntu'] %} {% set rally_packages = ['rally'] %} {% endif %} @@ -19,18 +19,15 @@ RUN useradd --user-group rally ADD rally-archive /rally-source RUN ln -s rally-source/* rally \ - && useradd --user-group rally \ && /var/lib/kolla/venv/bin/pip --no-cache-dir install --upgrade -c requirements/upper-constraints.txt /rally \ - && mkdir -p /etc/rally /var/log/rally /home/rally \ - && chown -R rally: /etc/rally /var/log/rally /home/rally + && mkdir -p /etc/rally /var/log/rally \ + && chown -R rally: /etc/rally /var/log/rally {% endif %} COPY extend_start.sh /usr/local/bin/kolla_extend_start RUN chmod 755 /usr/local/bin/kolla_extend_start -RUN usermod -a -G kolla rally - {% block rally_footer %}{% endblock %} {% block footer %}{% endblock %} {{ include_footer }} |