diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-01-17 14:27:12 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-01-17 14:27:13 +0000 |
| commit | be9a8789a698b45f9eb423c599fc603b80472bc9 (patch) | |
| tree | 0689a24a8738d770a1269f7da9c0a74005a11097 /docker/vmtp | |
| parent | 29642a8fcaebef4e60edfda040a0bf83e1d1f3a0 (diff) | |
| parent | 58eee09c15dea81ec51bb366af23681de70ceaa1 (diff) | |
| download | kolla-be9a8789a698b45f9eb423c599fc603b80472bc9.tar.gz kolla-be9a8789a698b45f9eb423c599fc603b80472bc9.zip | |
Merge "use static uid/gid in images"
Diffstat (limited to 'docker/vmtp')
| -rw-r--r-- | docker/vmtp/Dockerfile.j2 | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/docker/vmtp/Dockerfile.j2 b/docker/vmtp/Dockerfile.j2 index b75079131..ffd3dfd5d 100644 --- a/docker/vmtp/Dockerfile.j2 +++ b/docker/vmtp/Dockerfile.j2 @@ -3,6 +3,10 @@ MAINTAINER {{ maintainer }} {% block vmtp_header %}{% endblock %} +{% import "macros.j2" as macros with context %} + +{{ macros.configure_user(name='vmtp') }} + {% if install_type == 'binary' %} RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ @@ -10,15 +14,13 @@ RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ {% elif install_type == 'source' %} -RUN pip install vmtp \ - && useradd --user-group vmtp +RUN pip install vmtp {% endif %} COPY vmtp_sudoers /etc/sudoers.d/kolla_vmtp_sudoers RUN chmod 750 /etc/sudoers.d \ - && chmod 440 /etc/sudoers.d/kolla_vmtp_sudoers \ - && usermod -a -G kolla vmtp + && chmod 440 /etc/sudoers.d/kolla_vmtp_sudoers {% block vmtp_footer %}{% endblock %} {% block footer %}{% endblock %} |