diff options
| author | Jeffrey Zhang <zhang.lei.fly@gmail.com> | 2017-02-02 15:22:36 +0800 |
|---|---|---|
| committer | Jeffrey Zhang <zhang.lei.fly@gmail.com> | 2017-02-05 10:44:48 +0800 |
| commit | e5903d5fa9ef545595f7e98b73eb3bb31b72b4bb (patch) | |
| tree | e22c8ca3f685c43b0414b147d68cee7b783ed39a /docker/ceilometer | |
| parent | 061c3f8371902b997bf007a555240403e53ba4ec (diff) | |
| download | kolla-e5903d5fa9ef545595f7e98b73eb3bb31b72b4bb.tar.gz kolla-e5903d5fa9ef545595f7e98b73eb3bb31b72b4bb.zip | |
Remove include_header and include_footer in all Dockerfiles
include_header and include_footer parameter is already removed, remove
them in all Dockerfiles.
Add missing footer block.
Change-Id: I90da03eb9f95a3827361d5f5ede65fde7d6be2b3
Diffstat (limited to 'docker/ceilometer')
5 files changed, 0 insertions, 5 deletions
diff --git a/docker/ceilometer/ceilometer-api/Dockerfile.j2 b/docker/ceilometer/ceilometer-api/Dockerfile.j2 index dbe6c264e..885155e74 100644 --- a/docker/ceilometer/ceilometer-api/Dockerfile.j2 +++ b/docker/ceilometer/ceilometer-api/Dockerfile.j2 @@ -63,4 +63,3 @@ RUN chmod 755 /usr/local/bin/kolla_ceilometer_extend_start {% block ceilometer_api_footer %}{% endblock %} {% block footer %}{% endblock %} -{{ include_footer }} diff --git a/docker/ceilometer/ceilometer-central/Dockerfile.j2 b/docker/ceilometer/ceilometer-central/Dockerfile.j2 index 3d3d4e921..4b3563ad6 100644 --- a/docker/ceilometer/ceilometer-central/Dockerfile.j2 +++ b/docker/ceilometer/ceilometer-central/Dockerfile.j2 @@ -18,6 +18,5 @@ MAINTAINER {{ maintainer }} {% block ceilometer_central_footer %}{% endblock %} {% block footer %}{% endblock %} -{{ include_footer }} USER ceilometer diff --git a/docker/ceilometer/ceilometer-collector/Dockerfile.j2 b/docker/ceilometer/ceilometer-collector/Dockerfile.j2 index c2e67bbc5..aaa08169d 100644 --- a/docker/ceilometer/ceilometer-collector/Dockerfile.j2 +++ b/docker/ceilometer/ceilometer-collector/Dockerfile.j2 @@ -18,6 +18,5 @@ MAINTAINER {{ maintainer }} {% block ceilometer_collector_footer %}{% endblock %} {% block footer %}{% endblock %} -{{ include_footer }} USER ceilometer diff --git a/docker/ceilometer/ceilometer-compute/Dockerfile.j2 b/docker/ceilometer/ceilometer-compute/Dockerfile.j2 index 76298e062..6c793b490 100644 --- a/docker/ceilometer/ceilometer-compute/Dockerfile.j2 +++ b/docker/ceilometer/ceilometer-compute/Dockerfile.j2 @@ -38,7 +38,6 @@ RUN /var/lib/kolla/venv/bin/pip --no-cache-dir install --upgrade -c requirements {% block ceilometer_compute_footer %}{% endblock %} {% block footer %}{% endblock %} -{{ include_footer }} # NOTE(huikang): non-root user does not work with libvirt.sock. # Need configuration in nova-libvirt container to allow diff --git a/docker/ceilometer/ceilometer-notification/Dockerfile.j2 b/docker/ceilometer/ceilometer-notification/Dockerfile.j2 index 6d351391b..891149739 100644 --- a/docker/ceilometer/ceilometer-notification/Dockerfile.j2 +++ b/docker/ceilometer/ceilometer-notification/Dockerfile.j2 @@ -18,6 +18,5 @@ MAINTAINER {{ maintainer }} {% block ceilometer_notification_footer %}{% endblock %} {% block footer %}{% endblock %} -{{ include_footer }} USER ceilometer |