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/bifrost | |
| 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/bifrost')
| -rw-r--r-- | docker/bifrost/bifrost-base/Dockerfile.j2 | 9 |
1 files changed, 7 insertions, 2 deletions
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 %} |
