diff options
| author | Sam Yaple <sam@yaple.net> | 2016-12-18 19:11:47 +0000 |
|---|---|---|
| committer | Mauricio Lima <mauriciolimab@gmail.com> | 2017-01-17 09:02:21 -0300 |
| commit | 58eee09c15dea81ec51bb366af23681de70ceaa1 (patch) | |
| tree | e84ce37d18be555e80e9c895789615ec60a37b5b /docker/heka | |
| parent | 3671d860af55d88804740f0420d5bc7e5bb92bd9 (diff) | |
| download | kolla-58eee09c15dea81ec51bb366af23681de70ceaa1.tar.gz kolla-58eee09c15dea81ec51bb366af23681de70ceaa1.zip | |
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 <klindgren@godaddy.com>
Change-Id: I120f26ab0683dc87d69727c3df8d4707e52a4543
Partially-Implements: blueprint static-uid-gid
Diffstat (limited to 'docker/heka')
| -rw-r--r-- | docker/heka/Dockerfile.j2 | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/docker/heka/Dockerfile.j2 b/docker/heka/Dockerfile.j2 index 142bd2e0e..1756849fb 100644 --- a/docker/heka/Dockerfile.j2 +++ b/docker/heka/Dockerfile.j2 @@ -5,12 +5,13 @@ MAINTAINER {{ maintainer }} {% import "macros.j2" as macros with context %} +{{ macros.configure_user(name='heka', homedir='/var/cache/hekad') }} + {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} {% set heka_packages = [ 'https://github.com/mozilla-services/heka/releases/download/v0.10.0/heka-0_10_0-linux-amd64.rpm' ] %} -RUN useradd --user-group heka \ - && mkdir /etc/heka +RUN mkdir /etc/heka {% elif base_distro in ['ubuntu', 'debian'] %} {% set heka_packages = [ @@ -27,8 +28,7 @@ COPY plugins/encoders /usr/share/heka/lua_encoders/ COPY heka_sudoers /etc/sudoers.d/kolla_heka_sudoers COPY extend_start.sh /usr/local/bin/kolla_extend_start -RUN usermod -a -G kolla heka \ - && chmod 440 /etc/sudoers.d/kolla_heka_sudoers \ +RUN chmod 440 /etc/sudoers.d/kolla_heka_sudoers \ && chmod 755 /usr/local/bin/kolla_extend_start \ && chown -R heka: /usr/share/heka /etc/heka |