openstack/kolla-ansible
Code Issues Proposed changes

Customizations for memcached

Browse Source 
This patcheset contains customization of Dockerfiles of memcached containers

Change-Id: I41b1f66be293aa605029ba7a59c1bc59889ac2f4
Partially-implements: blueprint third-party-plugin-support
This commit is contained in:
Marga Millet 2016-01-22 15:46:44 -08:00
parent e5ca547f37
commit 997fc3bed2
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
docker/memcached/Dockerfile.j2
View File

@ -1,24 +1,26 @@
FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }} FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }}
MAINTAINER {{ maintainer }} MAINTAINER {{ maintainer }}
{% import "macros.j2" as macros with context %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
{% set user = 'memcached' %} {% set user = 'memcached' %}
RUN yum -y install \ {% set memcached_packages = ['memcached'] %}
memcached \ RUN {{ macros.install_packages(memcached_packages | customizable("packages")) }} \
&& yum clean all \
&& usermod -a -G kolla {{ user }} && usermod -a -G kolla {{ user }}
{% elif base_distro in ['ubuntu', 'debian'] %} {% elif base_distro in ['ubuntu', 'debian'] %}
{% set user = 'memcache' %} {% set user = 'memcache' %}
RUN apt-get -y install --no-install-recommends \ {% set memcached_packages = ['memcached'] %}
memcached \ RUN {{ macros.install_packages(memcached_packages | customizable("packages")) }} \
&& apt-get clean \
&& usermod -a -G kolla {{ user }} && usermod -a -G kolla {{ user }}
{% endif %} {% endif %}
{% block memcached_footer %}{% endblock %}
{% block footer %}{% endblock %}
{{ include_footer }} {{ include_footer }}
USER {{ user }} USER {{ user }}