diff options
| author | Edmund Rhudy <erhudy@bloomberg.net> | 2017-01-18 16:28:56 -0500 |
|---|---|---|
| committer | Jeffrey Zhang <jeffrey.zhang@99cloud.net> | 2017-01-20 07:53:43 +0000 |
| commit | 7930127e620a6672d49dc1a20b97d4d7b9f4b848 (patch) | |
| tree | eb4fe7ddf63df63055b17c11810ef4e9a8cc13f6 /docker/base | |
| parent | cae2305f78eb7046ad0bc4dd05626227bd74c9a9 (diff) | |
| download | kolla-7930127e620a6672d49dc1a20b97d4d7b9f4b848.tar.gz kolla-7930127e620a6672d49dc1a20b97d4d7b9f4b848.zip | |
Add block for dumb-init installation
This moves the dumb-init installation to its own RUN command in a
separate block so that it can be overridden for Internet-disconnected
builds.
Change-Id: Ice1d6b086db85d2c2b364518b26eb819e92e1d4f
Closes-Bug: #1657583
Diffstat (limited to 'docker/base')
| -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"] |