diff options
| author | Britt Houser <bhouser@cisco.com> | 2015-11-13 15:55:47 -0500 |
|---|---|---|
| committer | Britt Houser <bhouser@cisco.com> | 2015-11-14 11:38:30 -0500 |
| commit | 66c15ce55eae078ae43628e91e4b3bfd516317a5 (patch) | |
| tree | 3312ad7b147b775e49513e3befa9704c5e12bacf | |
| parent | f54c5bee3ab6bab6b088c9c0e5ee59e0e5d93bb8 (diff) | |
| download | kolla-66c15ce55eae078ae43628e91e4b3bfd516317a5.tar.gz kolla-66c15ce55eae078ae43628e91e4b3bfd516317a5.zip | |
drop root on memcached
This patch add the USER directive to the memcached container.
It also removes the -u from the command line to launch
memcached, since it will already be run as that use.
Change-Id: I87d782a424df99fe1b5694debafa3c0c4a9aba27
Partially-Implements: blueprint drop-root
| -rw-r--r-- | ansible/roles/memcached/templates/memcached.json.j2 | 3 | ||||
| -rw-r--r-- | docker/memcached/Dockerfile.j2 | 10 |
2 files changed, 9 insertions, 4 deletions
diff --git a/ansible/roles/memcached/templates/memcached.json.j2 b/ansible/roles/memcached/templates/memcached.json.j2 index a32e899e2..06bc2b4e7 100644 --- a/ansible/roles/memcached/templates/memcached.json.j2 +++ b/ansible/roles/memcached/templates/memcached.json.j2 @@ -1,5 +1,4 @@ -{% set memcache_user = 'memcache' if kolla_base_distro in ['ubuntu', 'debian'] else 'memcached' %} { - "command": "/usr/bin/memcached -u {{ memcache_user }} -vv -l {{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['address'] }} -p {{ memcached_port }}", + "command": "/usr/bin/memcached -vv -l {{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['address'] }} -p {{ memcached_port }}", "config_files": [] } diff --git a/docker/memcached/Dockerfile.j2 b/docker/memcached/Dockerfile.j2 index d8e023aaf..db75d880a 100644 --- a/docker/memcached/Dockerfile.j2 +++ b/docker/memcached/Dockerfile.j2 @@ -3,14 +3,20 @@ MAINTAINER Kolla Project (https://launchpad.net/kolla) {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} +{% set user = 'memcached' %} RUN yum -y install memcached \ - && yum clean all + && yum clean all \ + && usermod -a -G kolla {{ user }} {% elif base_distro in ['ubuntu', 'debian'] %} +{% set user = 'memcache' %} RUN apt-get install -y --no-install-recommends memcached \ - && apt-get clean + && apt-get clean \ + && usermod -a -G kolla {{ user }} {% endif %} {{ include_footer }} + +USER {{ user }} |