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/memcached | |
| 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/memcached')
| -rw-r--r-- | docker/memcached/Dockerfile.j2 | 19 |
1 files changed, 4 insertions, 15 deletions
diff --git a/docker/memcached/Dockerfile.j2 b/docker/memcached/Dockerfile.j2 index 933085cf1..518986f7c 100644 --- a/docker/memcached/Dockerfile.j2 +++ b/docker/memcached/Dockerfile.j2 @@ -5,24 +5,13 @@ MAINTAINER {{ maintainer }} {% import "macros.j2" as macros with context %} -{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} +{{ macros.configure_user(name='memcached', homedir='/run/memcache') }} -{% set user = 'memcached' %} - {% set memcached_packages = ['memcached'] %} -{{ macros.install_packages(memcached_packages | customizable("packages")) }} \ - && usermod -a -G kolla {{ user }} - -{% elif base_distro in ['ubuntu', 'debian'] %} - -{% set user = 'memcache' %} - {% set memcached_packages = ['memcached'] %} -{{ macros.install_packages(memcached_packages | customizable("packages")) }} \ - && usermod -a -G kolla {{ user }} - -{% endif %} +{% set memcached_packages = ['memcached'] %} +{{ macros.install_packages(memcached_packages | customizable("packages")) }} {% block memcached_footer %}{% endblock %} {% block footer %}{% endblock %} {{ include_footer }} -USER {{ user }} +USER memcached |