diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-02-07 14:56:26 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-02-07 14:56:26 +0000 |
| commit | b43efe5377e60328183bf567504fc7b9ae9cbdeb (patch) | |
| tree | 537e8edb1d063778898e82d352f96824e001fb60 /docker/ceilometer | |
| parent | 40130b2e7a591931ddac366dc6f8d085e1f83e37 (diff) | |
| parent | e5903d5fa9ef545595f7e98b73eb3bb31b72b4bb (diff) | |
| download | kolla-b43efe5377e60328183bf567504fc7b9ae9cbdeb.tar.gz kolla-b43efe5377e60328183bf567504fc7b9ae9cbdeb.zip | |
Merge "Remove include_header and include_footer in all Dockerfiles"
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 |