aboutsummaryrefslogtreecommitdiff
path: root/docker/openstack-base/Dockerfile.j2
diff options
context:
space:
mode:
authorMartin André <m.andre@redhat.com>2015-10-13 09:52:45 +0900
committerMartin André <m.andre@redhat.com>2015-10-13 09:52:45 +0900
commite9ed7ca403e55fb231ece5c56d7f44a49234ad48 (patch)
tree3030529b3c8138d3a94d59aec5a6b26aa06034aa /docker/openstack-base/Dockerfile.j2
parentba3b1bcf90549e276f8f6d94b38c9b1c8816b2ed (diff)
downloadkolla-e9ed7ca403e55fb231ece5c56d7f44a49234ad48.tar.gz
kolla-e9ed7ca403e55fb231ece5c56d7f44a49234ad48.zip
Remove obsolete backport for oslo.log
The patch was merged upstream. Remove it from kolla tree since it doesn't apply cleanly anymore and break openstack-base image building. backport: liberty Change-Id: Ia82aa10860d24d696a172ec6596076c9b6b2d0a5 Closes-Bug: #1505456
Diffstat (limited to 'docker/openstack-base/Dockerfile.j2')
-rw-r--r--docker/openstack-base/Dockerfile.j29
1 files changed, 0 insertions, 9 deletions
diff --git a/docker/openstack-base/Dockerfile.j2 b/docker/openstack-base/Dockerfile.j2
index f730a2de4..345a1b604 100644
--- a/docker/openstack-base/Dockerfile.j2
+++ b/docker/openstack-base/Dockerfile.j2
@@ -8,7 +8,6 @@ RUN yum -y install \
mariadb-libs \
MySQL-python \
openssl \
- patch \
&& yum clean all
{% endif %}
@@ -68,7 +67,6 @@ RUN apt-get install -y --no-install-recommends \
libxslt1-dev \
libffi-dev \
libyaml-dev \
- patch \
pkg-config \
git \
&& apt-get clean
@@ -97,11 +95,4 @@ RUN curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py \
python-openstackclient \
MySQL-python
-# 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
-
{% endif %}