From 58eee09c15dea81ec51bb366af23681de70ceaa1 Mon Sep 17 00:00:00 2001 From: Sam Yaple Date: Sun, 18 Dec 2016 19:11:47 +0000 Subject: use static uid/gid in images This centralizes all user and group creation into a single source. This will fix any current and furture uid/gid mismatches (such as with nova-libvirt). In the process, we also unify users between the distros in a standard way. The users in the following containers change from thier defaults: Ubuntu: _chrony user is now chrony Ubuntu: memcache user is now memcached All: qemu user is used for ownership and socket permissions All uid and gid numbers are customizable via kolla-build.conf Co-Authored-By: Kris Lindgren Change-Id: I120f26ab0683dc87d69727c3df8d4707e52a4543 Partially-Implements: blueprint static-uid-gid --- docker/vmtp/Dockerfile.j2 | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'docker/vmtp') 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 %} -- cgit v1.2.3