diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-08-11 20:50:33 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-08-11 20:50:33 +0000 |
| commit | 56cab3c7ea9160abccf0c2899ae0cb7d45ea963e (patch) | |
| tree | ffa424d81077fecd8583083c36112bc833a372ec | |
| parent | e4259f805b91ce0859e7190f97f8dbf34ee92e45 (diff) | |
| parent | b9a2839da80055d869e1e48f877bdf91c0b5dd0c (diff) | |
| download | kolla-56cab3c7ea9160abccf0c2899ae0cb7d45ea963e.tar.gz kolla-56cab3c7ea9160abccf0c2899ae0cb7d45ea963e.zip | |
Merge "Customizations for Watcher"
| -rw-r--r-- | docker/watcher/watcher-api/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/watcher/watcher-applier/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/watcher/watcher-base/Dockerfile.j2 | 4 | ||||
| -rw-r--r-- | docker/watcher/watcher-engine/Dockerfile.j2 | 2 |
4 files changed, 10 insertions, 0 deletions
diff --git a/docker/watcher/watcher-api/Dockerfile.j2 b/docker/watcher/watcher-api/Dockerfile.j2 index fadf5ea03..d428f69d4 100644 --- a/docker/watcher/watcher-api/Dockerfile.j2 +++ b/docker/watcher/watcher-api/Dockerfile.j2 @@ -11,6 +11,8 @@ RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ COPY extend_start.sh /usr/local/bin/kolla_watcher_extend_start RUN chmod 755 /usr/local/bin/kolla_watcher_extend_start +{% block watcher_api_footer %}{% endblock %} +{% block footer %}{% endblock %} {{ include_footer }} USER watcher diff --git a/docker/watcher/watcher-applier/Dockerfile.j2 b/docker/watcher/watcher-applier/Dockerfile.j2 index dec6cff26..a3469103c 100644 --- a/docker/watcher/watcher-applier/Dockerfile.j2 +++ b/docker/watcher/watcher-applier/Dockerfile.j2 @@ -8,6 +8,8 @@ RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ {% endif %} +{% block watcher_applier_footer %}{% endblock %} +{% block footer %}{% endblock %} {{ include_footer }} USER watcher diff --git a/docker/watcher/watcher-base/Dockerfile.j2 b/docker/watcher/watcher-base/Dockerfile.j2 index f6f86ddf9..5e475f562 100644 --- a/docker/watcher/watcher-base/Dockerfile.j2 +++ b/docker/watcher/watcher-base/Dockerfile.j2 @@ -25,3 +25,7 @@ COPY extend_start.sh /usr/local/bin/kolla_extend_start RUN usermod -a -G kolla watcher \ && touch /usr/local/bin/kolla_watcher_extend_start \ && chmod 755 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_watcher_extend_start + +{% block watcher_base_footer %}{% endblock %} +{% block footer %}{% endblock %} +{{ include_footer }} diff --git a/docker/watcher/watcher-engine/Dockerfile.j2 b/docker/watcher/watcher-engine/Dockerfile.j2 index dec6cff26..bae251c92 100644 --- a/docker/watcher/watcher-engine/Dockerfile.j2 +++ b/docker/watcher/watcher-engine/Dockerfile.j2 @@ -8,6 +8,8 @@ RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ {% endif %} +{% block watcher_engine_footer %}{% endblock %} +{% block footer %}{% endblock %} {{ include_footer }} USER watcher |