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/cinder/cinder-base/Dockerfile.j2 | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'docker/cinder') diff --git a/docker/cinder/cinder-base/Dockerfile.j2 b/docker/cinder/cinder-base/Dockerfile.j2 index 989ded880..b50d0f978 100644 --- a/docker/cinder/cinder-base/Dockerfile.j2 +++ b/docker/cinder/cinder-base/Dockerfile.j2 @@ -5,6 +5,8 @@ MAINTAINER {{ maintainer }} {% import "macros.j2" as macros with context %} +{{ macros.configure_user(name='cinder') }} + {% if install_type == 'binary' %} {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} @@ -50,11 +52,10 @@ MAINTAINER {{ maintainer }} ADD cinder-base-archive /cinder-base-source RUN ln -s cinder-base-source/* cinder \ - && useradd --user-group cinder \ && /var/lib/kolla/venv/bin/pip --no-cache-dir install --upgrade -c requirements/upper-constraints.txt /cinder \ - && mkdir -p /etc/cinder /var/lib/cinder /home/cinder \ + && mkdir -p /etc/cinder \ && cp -r /cinder/etc/cinder/* /etc/cinder/ \ - && chown -R cinder: /etc/cinder /var/lib/cinder /home/cinder \ + && chown -R cinder: /etc/cinder \ && sed -i 's|^exec_dirs.*|exec_dirs=/var/lib/kolla/venv/bin,/sbin,/usr/sbin,/bin,/usr/bin,/usr/local/bin,/usr/local/sbin|g' /etc/cinder/rootwrap.conf {% endif %} @@ -62,9 +63,7 @@ RUN ln -s cinder-base-source/* cinder \ COPY cinder_sudoers /etc/sudoers.d/kolla_cinder_sudoers COPY extend_start.sh /usr/local/bin/kolla_extend_start -RUN usermod -a -G kolla cinder \ - && mkdir -p /etc/ceph \ - && chmod 750 /etc/sudoers.d \ +RUN chmod 750 /etc/sudoers.d \ && chmod 440 /etc/sudoers.d/kolla_cinder_sudoers \ && touch /usr/local/bin/kolla_cinder_extend_start \ && chmod 755 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_cinder_extend_start -- cgit v1.2.3