aboutsummaryrefslogtreecommitdiff
path: root/docker/designate
diff options
context:
space:
mode:
authorSam Yaple <sam@yaple.net>2016-12-18 19:11:47 +0000
committerMauricio Lima <mauriciolimab@gmail.com>2017-01-17 09:02:21 -0300
commit58eee09c15dea81ec51bb366af23681de70ceaa1 (patch)
treee84ce37d18be555e80e9c895789615ec60a37b5b /docker/designate
parent3671d860af55d88804740f0420d5bc7e5bb92bd9 (diff)
downloadkolla-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/designate')
-rw-r--r--docker/designate/designate-base/Dockerfile.j27
1 files changed, 4 insertions, 3 deletions
diff --git a/docker/designate/designate-base/Dockerfile.j2 b/docker/designate/designate-base/Dockerfile.j2
index 173f145d0..6e6c2d589 100644
--- a/docker/designate/designate-base/Dockerfile.j2
+++ b/docker/designate/designate-base/Dockerfile.j2
@@ -5,6 +5,8 @@ MAINTAINER {{ maintainer }}
{% import "macros.j2" as macros with context %}
+{{ macros.configure_user(name='designate') }}
+
{% if install_type == 'binary' %}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
@@ -39,12 +41,11 @@ RUN cp /etc/designate/policy.json /tmp/ \
ADD designate-base-archive /designate-base-source
RUN ln -s designate-base-source/* designate \
- && useradd --user-group designate \
&& /var/lib/kolla/venv/bin/pip --no-cache-dir install --upgrade -c requirements/upper-constraints.txt /designate \
- && mkdir -p /etc/designate /var/log/designate /home/designate \
+ && mkdir -p /etc/designate /var/log/designate \
&& cp -r /designate/etc/designate/* /etc/designate/ \
&& mv /etc/designate/rootwrap.conf.sample /etc/designate/rootwrap.conf \
- && chown -R designate: /etc/designate /var/log/designate /home/designate \
+ && chown -R designate: /etc/designate /var/log/designate \
&& 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/designate/rootwrap.conf
{% endif %}