diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-08-12 10:08:28 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-08-12 10:08:28 +0000 |
| commit | dd853d0c47331c1e91a506adf2ad292e4bb6cede (patch) | |
| tree | ab41eb584ff593da7f1fd3340790b7d028fafe36 /docker | |
| parent | a2e369982de76a5a48b54cfb5b87d045489b3e63 (diff) | |
| parent | 495a905b8032b4d3c68246be204384da2b0f3c3d (diff) | |
| download | kolla-dd853d0c47331c1e91a506adf2ad292e4bb6cede.tar.gz kolla-dd853d0c47331c1e91a506adf2ad292e4bb6cede.zip | |
Merge "Revert "Remove files from /var/lib/apt/lists when cleaning up on Ubuntu/Debian""
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/macros.j2 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/docker/macros.j2 b/docker/macros.j2 index 0774a187d..c10973ef6 100644 --- a/docker/macros.j2 +++ b/docker/macros.j2 @@ -2,6 +2,6 @@ {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] -%} yum -y install {{ packages | join(' ') }} && yum clean all {%- elif base_distro in ['ubuntu', 'debian'] -%} - apt-get -y install --no-install-recommends {{ packages | join(' ') }} && apt-get clean && rm -rf /var/lib/apt/lists/* + apt-get -y install --no-install-recommends {{ packages | join(' ') }} && apt-get clean {%- endif %} {%- endmacro %} |