From 495a905b8032b4d3c68246be204384da2b0f3c3d Mon Sep 17 00:00:00 2001 From: Paul Bourke Date: Wed, 10 Aug 2016 11:40:30 +0000 Subject: [PATCH] Revert "Remove files from /var/lib/apt/lists when cleaning up on Ubuntu/Debian" This reverts commit 4e8bf3f90da2b1b36575528a30926a575bfc4095. It seems removing /var/lib/apt/lists is having some unintended side effects causing apt to not find packages [0] [0] http://logs.openstack.org/87/350587/10/check/gate-kolla-dsvm-build-ubuntu-source/c0a22a3/console.html#_2016-08-09_13_41_14_477480 Change-Id: I89042e5883f19fddbae11d75b788f87ad5d871a1 --- docker/macros.j2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/macros.j2 b/docker/macros.j2 index 0774a187da..c10973ef64 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 %}