diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-04-13 08:34:38 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-04-13 08:34:38 +0000 |
| commit | d3eba7bab3d25650d8023e0f8308a1673f01590b (patch) | |
| tree | 88b72fc1e837e3b62a6db176e7928aed0cc414aa /docker | |
| parent | b042f4d51745a62f39156d17a665910f48ec6795 (diff) | |
| parent | 7b3bfc40e3b6cef3d1a9d59cb2109ddb84838364 (diff) | |
| download | kolla-d3eba7bab3d25650d8023e0f8308a1673f01590b.tar.gz kolla-d3eba7bab3d25650d8023e0f8308a1673f01590b.zip | |
Merge "Update Memcached dockerfile for formatting"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/memcached/Dockerfile.j2 | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/docker/memcached/Dockerfile.j2 b/docker/memcached/Dockerfile.j2 index eedda678e..73972a6e2 100644 --- a/docker/memcached/Dockerfile.j2 +++ b/docker/memcached/Dockerfile.j2 @@ -4,14 +4,16 @@ MAINTAINER {{ maintainer }} {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} {% set user = 'memcached' %} -RUN yum -y install memcached \ +RUN yum -y install \ + memcached \ && 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 \ +RUN apt-get install -y --no-install-recommends \ + memcached \ && apt-get clean \ && usermod -a -G kolla {{ user }} |