diff options
| author | Mark Goddard <mark@stackhpc.com> | 2018-12-13 12:07:59 +0000 |
|---|---|---|
| committer | Mark Goddard <mark@stackhpc.com> | 2018-12-13 15:03:16 +0000 |
| commit | 6258a920fdf8432f39696815765f3320afe92fca (patch) | |
| tree | b42229971f39c2a422a1a19488564c701827c6e0 /docker | |
| parent | 8e16827082045a053770459e8c959b4f8fe76f20 (diff) | |
| download | kolla-6258a920fdf8432f39696815765f3320afe92fca.tar.gz kolla-6258a920fdf8432f39696815765f3320afe92fca.zip | |
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
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/bifrost/bifrost-deploy/Dockerfile.j2 | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/docker/bifrost/bifrost-deploy/Dockerfile.j2 b/docker/bifrost/bifrost-deploy/Dockerfile.j2 index 5a663cd3a..c071d716e 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 %} |