From fe7ff62f68689362799cc9147cd456dd633255fe Mon Sep 17 00:00:00 2001
From: Mark Goddard <mark@stackhpc.com>
Date: Thu, 13 Dec 2018 12:07:59 +0000
Subject: [PATCH] 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 6258a920fdf8432f39696815765f3320afe92fca)
---
 docker/bifrost/bifrost-deploy/Dockerfile.j2 | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docker/bifrost/bifrost-deploy/Dockerfile.j2 b/docker/bifrost/bifrost-deploy/Dockerfile.j2
index 5a663cd3aa..c071d716e8 100644
--- a/docker/bifrost/bifrost-deploy/Dockerfile.j2
+++ b/docker/bifrost/bifrost-deploy/Dockerfile.j2
@@ -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 %}