aboutsummaryrefslogtreecommitdiff
path: root/docker/base
diff options
context:
space:
mode:
Diffstat (limited to 'docker/base')
-rw-r--r--docker/base/Dockerfile.j24
-rw-r--r--docker/base/start.sh2
2 files changed, 4 insertions, 2 deletions
diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2
index 6da12b197..6042f57a4 100644
--- a/docker/base/Dockerfile.j2
+++ b/docker/base/Dockerfile.j2
@@ -277,7 +277,9 @@ RUN touch /usr/local/bin/kolla_extend_start \
&& chmod 755 /usr/local/bin/kolla_start /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_set_configs \
&& chmod 440 /etc/sudoers \
&& groupadd kolla \
- && rm -f /tmp/kolla_bashrc
+ && rm -f /tmp/kolla_bashrc \
+ && curl -sSL https://github.com/Yelp/dumb-init/releases/download/v1.1.3/dumb-init_1.1.3_amd64 -o /usr/local/bin/dumb-init \
+ && chmod +x /usr/local/bin/dumb-init
{% block base_footer %}{% endblock %}
CMD ["kolla_start"]
diff --git a/docker/base/start.sh b/docker/base/start.sh
index 261291268..3ca6291fc 100644
--- a/docker/base/start.sh
+++ b/docker/base/start.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/local/bin/dumb-init /bin/bash
set -o errexit
# Wait for the log socket