diff options
| author | Zuul <zuul@review.openstack.org> | 2017-11-12 07:45:19 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-11-12 07:45:19 +0000 |
| commit | 8ac97bb9d11d022685e338ff95edad452a361c61 (patch) | |
| tree | be3e184ccc1d877a3dc495e5673448b79e29bfac /docker/macros.j2 | |
| parent | a9c8f6abad9ac3718f88d66663501a2cf4c6f817 (diff) | |
| parent | 4de0706190b2f79aacb63fad3e397ce81f76e2e1 (diff) | |
| download | kolla-8ac97bb9d11d022685e338ff95edad452a361c61.tar.gz kolla-8ac97bb9d11d022685e338ff95edad452a361c61.zip | |
Merge "Cleanup APT lists after installing packages"
Diffstat (limited to 'docker/macros.j2')
| -rw-r--r-- | docker/macros.j2 | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/docker/macros.j2 b/docker/macros.j2 index 06a911b5e..5294ddacf 100644 --- a/docker/macros.j2 +++ b/docker/macros.j2 @@ -49,10 +49,12 @@ RUN usermod --append --home {{ homedir }} --groups kolla {{ name }} \ {% macro debian_haproxy_existing_user_fix() %} {# NOTE(SamYaple): The postinst script breaks if the user 'haproxy' already exists #} -RUN apt-get -y install --no-install-recommends haproxy \ +RUN apt-get update \ + && apt-get -y install --no-install-recommends haproxy \ || sed -i '/^adduser/,+1 d' /var/lib/dpkg/info/haproxy.postinst \ && apt-get -y install -f \ - && apt-get clean + && apt-get clean \ + && rm -rf /var/lib/apt/lists/* {% endmacro %} {% macro debian_opendaylight_existing_user_fix() %} @@ -61,7 +63,8 @@ RUN apt-get update \ && apt-get -y install --no-install-recommends opendaylight \ || sed -i '/^\s*adduser/,+1 d' /var/lib/dpkg/info/opendaylight.postinst \ && apt-get -y install -f \ - && apt-get clean + && apt-get clean \ + && rm -rf /var/lib/apt/lists/* {% endmacro %} {% macro install_kubectl() %} |
