openstack
/
kolla
Code Issues Proposed changes

Clear ENTRYPOINT configuration for Bifrost 

Bifrost was broken by the recent kolla change [1] to use an ENTRYPOINT
for dumb-init. The container failed to start because dumb-init was
trying to run /sbin/init, which expects to be pid 1.

[1] Id91ebb8b0ecc43946845de386350af0536dd661f

Change-Id: Id77ecfca09dfda8da984589f70a26433214ee3af
Closes-Bug: #1808326
Related-Bug: #1799642
(cherry picked from commit 6258a920fd)
This commit is contained in:
Mark Goddard 2018-12-13 12:07:59 +00:00
parent b8dfa9913e
commit fe7ff62f68
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docker/bifrost/bifrost-deploy/Dockerfile.j2
View File

@ -54,6 +54,8 @@ RUN /usr/sbin/update-rc.d -f ondemand remove; \
{{ macros.install_packages(bifrost_deploy_packages | customizable("packages")) }}
# Clear any customisation by Kolla to entrypoint & command
ENTRYPOINT []
CMD [ "/sbin/init" ]
{% block bifrost_deploy_footer %}{% endblock %}