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/chrony/Dockerfile.j2 | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) (limited to 'docker/chrony') diff --git a/docker/chrony/Dockerfile.j2 b/docker/chrony/Dockerfile.j2 index 8443bcc4e..d845b5001 100644 --- a/docker/chrony/Dockerfile.j2 +++ b/docker/chrony/Dockerfile.j2 @@ -5,18 +5,14 @@ MAINTAINER {{ maintainer }} {% import "macros.j2" as macros with context %} -{% set chrony_packages = ['chrony'] %} +{{ macros.configure_user(name='chrony') }} -{% if base_distro in ['ubuntu', 'debian'] %} -# Ubuntu use _chrony username to use unified running user with RHEL system -RUN useradd --user-group --create-home --home-dir /var/lib/chrony chrony -{% endif %} +{% set chrony_packages = ['chrony'] %} {{ macros.install_packages(chrony_packages | customizable("packages")) }} COPY extend_start.sh /usr/local/bin/kolla_extend_start -RUN chmod 755 /usr/local/bin/kolla_extend_start \ - && usermod -a -G kolla chrony +RUN chmod 755 /usr/local/bin/kolla_extend_start {% block chrony_footer %}{% endblock %} {% block footer %}{% endblock %} -- cgit v1.2.3