diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-01-20 22:24:55 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-01-20 22:24:55 +0000 |
| commit | b08f2cc60ef7f4a0a8a9828d2ff1cf2fc44beaf9 (patch) | |
| tree | 52330af10e5813922f3efffbe232692a6e2ecca7 /docker | |
| parent | 94d0d058ed6161d9166592540eebbd9a168e53c0 (diff) | |
| parent | 7930127e620a6672d49dc1a20b97d4d7b9f4b848 (diff) | |
| download | kolla-b08f2cc60ef7f4a0a8a9828d2ff1cf2fc44beaf9.tar.gz kolla-b08f2cc60ef7f4a0a8a9828d2ff1cf2fc44beaf9.zip | |
Merge "Add block for dumb-init installation"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/base/Dockerfile.j2 | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2 index 42ff0cc77..97cb90b3f 100644 --- a/docker/base/Dockerfile.j2 +++ b/docker/base/Dockerfile.j2 @@ -310,15 +310,19 @@ COPY set_configs.py /usr/local/bin/kolla_set_configs COPY start.sh /usr/local/bin/kolla_start COPY sudoers /etc/sudoers COPY curlrc /root/.curlrc + +{% block dumb_init_installation %} +RUN 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 +{% endblock %} + 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 \ && mkdir -p /var/log/kolla \ && chown :kolla /var/log/kolla \ && chmod 2775 /var/log/kolla \ - && 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 + && rm -f /tmp/kolla_bashrc {% block base_footer %}{% endblock %} CMD ["kolla_start"] |