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/mistral/mistral-base/Dockerfile.j2 | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'docker/mistral') diff --git a/docker/mistral/mistral-base/Dockerfile.j2 b/docker/mistral/mistral-base/Dockerfile.j2 index 1b1983cd6..b2dca3c45 100644 --- a/docker/mistral/mistral-base/Dockerfile.j2 +++ b/docker/mistral/mistral-base/Dockerfile.j2 @@ -5,6 +5,8 @@ MAINTAINER {{ maintainer }} {% import "macros.j2" as macros with context %} +{{ macros.configure_user(name='mistral') }} + {% if install_type == 'binary' %} {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} @@ -18,16 +20,14 @@ MAINTAINER {{ maintainer }} ADD mistral-base-archive /mistral-base-source RUN ln -s mistral-base-source/* mistral \ - && useradd --user-group mistral \ && /var/lib/kolla/venv/bin/pip --no-cache-dir install /mistral \ - && mkdir -p /etc/mistral /home/mistral \ + && mkdir -p /etc/mistral \ && cp -r /mistral/etc/* /etc/mistral/ \ - && chown -R mistral: /etc/mistral /home/mistral + && chown -R mistral: /etc/mistral {% endif %} COPY extend_start.sh /usr/local/bin/kolla_extend_start -RUN usermod -a -G kolla mistral \ - && touch /usr/local/bin/kolla_mistral_extend_start \ +RUN touch /usr/local/bin/kolla_mistral_extend_start \ && chmod 755 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_mistral_extend_start -- cgit v1.2.3