From e5903d5fa9ef545595f7e98b73eb3bb31b72b4bb Mon Sep 17 00:00:00 2001 From: Jeffrey Zhang Date: Thu, 2 Feb 2017 15:22:36 +0800 Subject: 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 --- docker/gnocchi/gnocchi-api/Dockerfile.j2 | 1 - docker/gnocchi/gnocchi-metricd/Dockerfile.j2 | 2 -- docker/gnocchi/gnocchi-statsd/Dockerfile.j2 | 2 -- 3 files changed, 5 deletions(-) (limited to 'docker/gnocchi') diff --git a/docker/gnocchi/gnocchi-api/Dockerfile.j2 b/docker/gnocchi/gnocchi-api/Dockerfile.j2 index edee1bc7f..f42d27369 100644 --- a/docker/gnocchi/gnocchi-api/Dockerfile.j2 +++ b/docker/gnocchi/gnocchi-api/Dockerfile.j2 @@ -23,4 +23,3 @@ RUN chmod 755 /usr/local/bin/kolla_gnocchi_extend_start {% block gnocchi_api_footer %}{% endblock %} {% block footer %}{% endblock %} -{{ include_footer }} diff --git a/docker/gnocchi/gnocchi-metricd/Dockerfile.j2 b/docker/gnocchi/gnocchi-metricd/Dockerfile.j2 index 7ef3955ce..365edf370 100644 --- a/docker/gnocchi/gnocchi-metricd/Dockerfile.j2 +++ b/docker/gnocchi/gnocchi-metricd/Dockerfile.j2 @@ -17,6 +17,4 @@ MAINTAINER {{ maintainer }} {% block gnocchi_metricd_footer %}{% endblock %} {% block footer %}{% endblock %} -{{ include_footer }} - USER gnocchi diff --git a/docker/gnocchi/gnocchi-statsd/Dockerfile.j2 b/docker/gnocchi/gnocchi-statsd/Dockerfile.j2 index 20ab2135b..399cc9535 100644 --- a/docker/gnocchi/gnocchi-statsd/Dockerfile.j2 +++ b/docker/gnocchi/gnocchi-statsd/Dockerfile.j2 @@ -15,6 +15,4 @@ MAINTAINER {{ maintainer }} {% block gnocchi_statsd_footer %}{% endblock %} {% block footer %}{% endblock %} -{{ include_footer }} - USER gnocchi -- cgit v1.2.3