diff options
| author | Christian Berendt <berendt@betacloud-solutions.de> | 2017-10-04 15:54:08 +0200 |
|---|---|---|
| committer | Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> | 2017-11-02 13:55:49 +0100 |
| commit | 4de0706190b2f79aacb63fad3e397ce81f76e2e1 (patch) | |
| tree | 1e98c91f98847f9d60366c70e516068f2f378e7d /docker | |
| parent | 93b91ceef6d19eb875d72ad7fe5fd5f8f69f0ffb (diff) | |
| download | kolla-4de0706190b2f79aacb63fad3e397ce81f76e2e1.tar.gz kolla-4de0706190b2f79aacb63fad3e397ce81f76e2e1.zip | |
Cleanup APT lists after installing packages
/var/lib/apt/lists/ can take several MBs so get rid of them after
packages are installed.
Change-Id: Icfff55d92fa5c865f09db5112da28bf452a5a221
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/base/Dockerfile.j2 | 6 | ||||
| -rw-r--r-- | docker/bifrost/bifrost-base/Dockerfile.j2 | 9 | ||||
| -rw-r--r-- | docker/macros.j2 | 9 |
3 files changed, 17 insertions, 7 deletions
diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2 index eab6ce537..2b234a460 100644 --- a/docker/base/Dockerfile.j2 +++ b/docker/base/Dockerfile.j2 @@ -268,7 +268,8 @@ COPY dpkg_reducing_disk_footprint /etc/dpkg/dpkg.cfg.d/dpkg_reducing_disk_footpr # apt-get update will not work if any repositories are accessed via HTTPS RUN apt-get update \ && apt-get -y install --no-install-recommends apt-transport-https ca-certificates gnupg dirmngr curl \ - && apt-get clean + && apt-get clean \ + && rm -rf /var/lib/apt/lists/* {% endblock %} {% block base_ubuntu_package_sources_list %} @@ -365,7 +366,8 @@ RUN apt-get update \ {%- for package in base_apt_packages | customizable('apt_packages') %} {{ package }} \ {%- endfor %} - && apt-get clean + && apt-get clean \ + && rm -rf /var/lib/apt/lists/* {% endblock %} {% if base_distro == 'ubuntu' %} diff --git a/docker/bifrost/bifrost-base/Dockerfile.j2 b/docker/bifrost/bifrost-base/Dockerfile.j2 index ff700dbb9..faeb74ace 100644 --- a/docker/bifrost/bifrost-base/Dockerfile.j2 +++ b/docker/bifrost/bifrost-base/Dockerfile.j2 @@ -31,11 +31,16 @@ RUN sed -e "s/.*mariadb.*//Ig" -i /etc/apt/sources.list && apt-get purge -y mari {% endif %} {% block bifrost_ansible_install %} -RUN bash -c './scripts/env-setup.sh && source ./env-vars && \ +{% if base_distro in ['debian', 'ubuntu'] %} +RUN apt-get update && \ +{% else %} +RUN echo " " && \ +{% endif %} + bash -c './scripts/env-setup.sh && source ./env-vars && \ ansible-playbook -vvvv -i /bifrost/playbooks/inventory/target /bifrost/playbooks/install.yaml \ -e @/tmp/build_arg.yml && \ {% if base_distro in ['debian', 'ubuntu'] %} - apt-get clean' + apt-get clean && rm -rf /var/lib/apt/lists/*' {% else %} yum clean all' {% endif %} 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() %} |