diff options
Diffstat (limited to 'docker/openstack-base/Dockerfile.j2')
| -rw-r--r-- | docker/openstack-base/Dockerfile.j2 | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/docker/openstack-base/Dockerfile.j2 b/docker/openstack-base/Dockerfile.j2 index 893014088..36c1c1c34 100644 --- a/docker/openstack-base/Dockerfile.j2 +++ b/docker/openstack-base/Dockerfile.j2 @@ -1,6 +1,13 @@ FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }} MAINTAINER Kolla Project (https://launchpad.net/kolla) +{% if base_distro in ['fedora', 'centos', 'oraclelinux', 'rhel'] %} + +RUN yum -y install patch \ + && yum clean all + +{% endif %} + {% if install_type == 'source' %} {% if base_distro in ['ubuntu', 'debian'] %} @@ -14,6 +21,7 @@ RUN apt-get install -y --no-install-recommends \ libxslt1-dev \ libffi-dev \ libyaml-dev \ + patch \ pkg-config \ git \ && apt-get clean @@ -43,3 +51,10 @@ RUN curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py \ MySQL-python {% endif %} + +# TODO(sdake): Remove a backport of a patch which is not yet in the packaging +# to make oslo.log work properly once the patch is in oslo.log +# NB: Please remove patch from the list of packages for both +# RPM and APT. +COPY 0001-Fix-unintended-assignment-of-syslog.patch / +RUN patch -p1 -d /usr/lib/python2.7/site-packages < /0001-Fix-unintended-assignment-of-syslog.patch |