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/telegraf/Dockerfile.j2 | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'docker/telegraf') diff --git a/docker/telegraf/Dockerfile.j2 b/docker/telegraf/Dockerfile.j2 index a490918ab..d6f30d718 100644 --- a/docker/telegraf/Dockerfile.j2 +++ b/docker/telegraf/Dockerfile.j2 @@ -5,6 +5,8 @@ MAINTAINER {{ maintainer }} {% import "macros.j2" as macros with context %} +{{ macros.configure_user(name='telegraf', homedir='/etc/telegraf') }} + {% set telegraf_packages = ['telegraf'] %} {{ macros.install_packages(telegraf_packages | customizable("packages")) }} @@ -13,8 +15,7 @@ COPY extend_start.sh /usr/local/bin/kolla_extend_start RUN chmod 750 /etc/sudoers.d \ && chmod 440 /etc/sudoers.d/kolla_telegraf_sudoers \ - && chmod 755 /usr/local/bin/kolla_extend_start \ - && usermod -a -G kolla telegraf + && chmod 755 /usr/local/bin/kolla_extend_start {% block telegraf_footer %}{% endblock %} {% block footer %}{% endblock %} -- cgit v1.2.3