diff options
| author | Steven Dake <stdake@cisco.com> | 2016-01-29 18:46:38 -0700 |
|---|---|---|
| committer | Steven Dake <stdake@cisco.com> | 2016-01-29 18:51:30 -0700 |
| commit | 5dd79bbbef1d886914a1bf77bb098442cfe522e4 (patch) | |
| tree | f55f0dc1c678deca02e271ed2f3ffbae6e9a9704 /docker | |
| parent | e92b18a8a8c0d7dd3d05ac2b48e469b5b4773215 (diff) | |
| download | kolla-5dd79bbbef1d886914a1bf77bb098442cfe522e4.tar.gz kolla-5dd79bbbef1d886914a1bf77bb098442cfe522e4.zip | |
Make kolla-toolbox container build on CentOS bin
Ansible installs pytz from pip which is newer then then pytz in
RDO repositories. As part of this process, it removes pytz
which corrupts the python installation in some way. This causes
further pip usage to produce a backtrace causing the kolla-toolbox
container not to build.
Mixing pip and RPM is not good.
Change-Id: I413468641bad5476cfcba61cb0e2189c31f3d682
Closes-Bug: #1545215
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/kolla-toolbox/Dockerfile.j2 | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/docker/kolla-toolbox/Dockerfile.j2 b/docker/kolla-toolbox/Dockerfile.j2 index fe80db693..8d27d0ef0 100644 --- a/docker/kolla-toolbox/Dockerfile.j2 +++ b/docker/kolla-toolbox/Dockerfile.j2 @@ -16,7 +16,8 @@ RUN yum -y install \ openssl-devel \ python-devel \ openssh-clients \ - && yum clean all + && yum clean all \ + && yum -y remove pytz {% elif base_distro in ['ubuntu', 'debian'] %} |