diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-08-09 15:50:32 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-08-09 15:50:32 +0000 |
| commit | 694265d30a955dae3d72e2cd598e260538c082b5 (patch) | |
| tree | 75244394b784beccd4bc21db45a808446b0c21e8 /docker/centos | |
| parent | b6d3f6176071769bca76192799d22c7b3913fb52 (diff) | |
| parent | 608527debc78f46e2d679f68199034313c5bb4bd (diff) | |
| download | kolla-694265d30a955dae3d72e2cd598e260538c082b5.tar.gz kolla-694265d30a955dae3d72e2cd598e260538c082b5.zip | |
Merge "Revert a8cc61ef so horizon will build"
Diffstat (limited to 'docker/centos')
| -rw-r--r-- | docker/centos/binary/horizon/Dockerfile | 7 | ||||
| l--------- | docker/centos/binary/horizon/horizon-bug-1469284.patch | 1 | ||||
| l--------- | docker/centos/source/horizon/horizon-bug-1469284.patch | 1 |
3 files changed, 1 insertions, 8 deletions
diff --git a/docker/centos/binary/horizon/Dockerfile b/docker/centos/binary/horizon/Dockerfile index d8b8bf8cf..60e625597 100644 --- a/docker/centos/binary/horizon/Dockerfile +++ b/docker/centos/binary/horizon/Dockerfile @@ -5,18 +5,13 @@ RUN yum -y install \ openstack-dashboard \ httpd \ mod_wsgi \ - patch \ && yum clean all \ && chown -R apache:apache /usr/share/openstack-dashboard/static # The chown is required because of this packaging bug: # https://bugzilla.redhat.com/show_bug.cgi?id=1219006 -COPY config-internal.sh config-external.sh horizon-bug-1469284.patch /opt/kolla/ -# TODO(mduggan): Need to remove this patch once a fix for -# https://bugs.launchpad.net/kolla/+bug/1469284 becomes available upstream. -# Review for this bug is at https://review.openstack.org/#/c/167981/ -RUN patch /usr/lib/python2.7/site-packages/openstack_auth/user.py < /opt/kolla/horizon-bug-1469284.patch +COPY config-internal.sh config-external.sh /opt/kolla/ COPY ./start.sh /start.sh CMD ["/start.sh"] diff --git a/docker/centos/binary/horizon/horizon-bug-1469284.patch b/docker/centos/binary/horizon/horizon-bug-1469284.patch deleted file mode 120000 index 32a745509..000000000 --- a/docker/centos/binary/horizon/horizon-bug-1469284.patch +++ /dev/null @@ -1 +0,0 @@ -../../../common/horizon/horizon-bug-1469284.patch
\ No newline at end of file diff --git a/docker/centos/source/horizon/horizon-bug-1469284.patch b/docker/centos/source/horizon/horizon-bug-1469284.patch deleted file mode 120000 index 32a745509..000000000 --- a/docker/centos/source/horizon/horizon-bug-1469284.patch +++ /dev/null @@ -1 +0,0 @@ -../../../common/horizon/horizon-bug-1469284.patch
\ No newline at end of file |