From 997fc3bed2027156e5b1a06b8f02a99937c31b0c Mon Sep 17 00:00:00 2001 From: Marga Millet Date: Fri, 22 Jan 2016 15:46:44 -0800 Subject: [PATCH] Customizations for memcached This patcheset contains customization of Dockerfiles of memcached containers Change-Id: I41b1f66be293aa605029ba7a59c1bc59889ac2f4 Partially-implements: blueprint third-party-plugin-support --- docker/memcached/Dockerfile.j2 | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/docker/memcached/Dockerfile.j2 b/docker/memcached/Dockerfile.j2 index 0b89df10f4..429b19748d 100644 --- a/docker/memcached/Dockerfile.j2 +++ b/docker/memcached/Dockerfile.j2 @@ -1,24 +1,26 @@ FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }} MAINTAINER {{ maintainer }} +{% import "macros.j2" as macros with context %} + {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} {% set user = 'memcached' %} -RUN yum -y install \ - memcached \ - && yum clean all \ + {% set memcached_packages = ['memcached'] %} +RUN {{ macros.install_packages(memcached_packages | customizable("packages")) }} \ && usermod -a -G kolla {{ user }} {% elif base_distro in ['ubuntu', 'debian'] %} {% set user = 'memcache' %} -RUN apt-get -y install --no-install-recommends \ - memcached \ - && apt-get clean \ + {% set memcached_packages = ['memcached'] %} +RUN {{ macros.install_packages(memcached_packages | customizable("packages")) }} \ && usermod -a -G kolla {{ user }} {% endif %} +{% block memcached_footer %}{% endblock %} +{% block footer %}{% endblock %} {{ include_footer }} USER {{ user }}