diff options
| author | Zuul <zuul@review.openstack.org> | 2018-12-18 07:13:42 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2018-12-18 07:13:42 +0000 |
| commit | 472d9e9ac8992582678aaeff083318a255edcf66 (patch) | |
| tree | e231dcfd0f1aaafc102da2891e0ab04ddb1bdb80 | |
| parent | 7d7e006841a72f218ffda3b0de5a83cd6292ad24 (diff) | |
| parent | 6258a920fdf8432f39696815765f3320afe92fca (diff) | |
| download | kolla-472d9e9ac8992582678aaeff083318a255edcf66.tar.gz kolla-472d9e9ac8992582678aaeff083318a255edcf66.zip | |
Merge "Clear ENTRYPOINT configuration for Bifrost"
| -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 %} |