diff options
| author | Marga Millet <marga.sfo@gmail.com> | 2016-01-22 15:46:44 -0800 |
|---|---|---|
| committer | Marga Millet <marga.sfo@gmail.com> | 2016-01-22 15:49:15 -0800 |
| commit | 997fc3bed2027156e5b1a06b8f02a99937c31b0c (patch) | |
| tree | 6dc1dca544017b666f70ccd88b7c149c19b206c6 /docker | |
| parent | e5ca547f373bdae7207236190422fd18840dd711 (diff) | |
| download | kolla-997fc3bed2027156e5b1a06b8f02a99937c31b0c.tar.gz kolla-997fc3bed2027156e5b1a06b8f02a99937c31b0c.zip | |
Customizations for memcached
This patcheset contains customization of Dockerfiles of memcached containers
Change-Id: I41b1f66be293aa605029ba7a59c1bc59889ac2f4
Partially-implements: blueprint third-party-plugin-support
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/memcached/Dockerfile.j2 | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/docker/memcached/Dockerfile.j2 b/docker/memcached/Dockerfile.j2 index 0b89df10f..429b19748 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 }} |