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/aodh/aodh-api/Dockerfile.j2 | 1 - docker/aodh/aodh-evaluator/Dockerfile.j2 | 2 -- docker/aodh/aodh-expirer/Dockerfile.j2 | 2 -- docker/aodh/aodh-listener/Dockerfile.j2 | 2 -- docker/aodh/aodh-notifier/Dockerfile.j2 | 2 -- 5 files changed, 9 deletions(-) (limited to 'docker/aodh') diff --git a/docker/aodh/aodh-api/Dockerfile.j2 b/docker/aodh/aodh-api/Dockerfile.j2 index 370b77286..639e9a40f 100644 --- a/docker/aodh/aodh-api/Dockerfile.j2 +++ b/docker/aodh/aodh-api/Dockerfile.j2 @@ -19,4 +19,3 @@ RUN chmod 755 /usr/local/bin/kolla_aodh_extend_start {% block aodh_api_footer %}{% endblock %} {% block footer %}{% endblock %} -{{ include_footer }} diff --git a/docker/aodh/aodh-evaluator/Dockerfile.j2 b/docker/aodh/aodh-evaluator/Dockerfile.j2 index 4fa319ce8..c1d896062 100644 --- a/docker/aodh/aodh-evaluator/Dockerfile.j2 +++ b/docker/aodh/aodh-evaluator/Dockerfile.j2 @@ -17,6 +17,4 @@ MAINTAINER {{ maintainer }} {% block aodh_evaluator_footer %}{% endblock %} {% block footer %}{% endblock %} -{{ include_footer }} - USER aodh diff --git a/docker/aodh/aodh-expirer/Dockerfile.j2 b/docker/aodh/aodh-expirer/Dockerfile.j2 index c43af18c7..476b49b2f 100644 --- a/docker/aodh/aodh-expirer/Dockerfile.j2 +++ b/docker/aodh/aodh-expirer/Dockerfile.j2 @@ -17,6 +17,4 @@ MAINTAINER {{ maintainer }} {% block aodh_expirer_footer %}{% endblock %} {% block footer %}{% endblock %} -{{ include_footer }} - USER aodh diff --git a/docker/aodh/aodh-listener/Dockerfile.j2 b/docker/aodh/aodh-listener/Dockerfile.j2 index 45b41a3ad..66621f960 100644 --- a/docker/aodh/aodh-listener/Dockerfile.j2 +++ b/docker/aodh/aodh-listener/Dockerfile.j2 @@ -17,6 +17,4 @@ MAINTAINER {{ maintainer }} {% block aodh_listener_footer %}{% endblock %} {% block footer %}{% endblock %} -{{ include_footer }} - USER aodh diff --git a/docker/aodh/aodh-notifier/Dockerfile.j2 b/docker/aodh/aodh-notifier/Dockerfile.j2 index 7e1fbadc1..8eca81974 100644 --- a/docker/aodh/aodh-notifier/Dockerfile.j2 +++ b/docker/aodh/aodh-notifier/Dockerfile.j2 @@ -17,6 +17,4 @@ MAINTAINER {{ maintainer }} {% block aodh_notifier_footer %}{% endblock %} {% block footer %}{% endblock %} -{{ include_footer }} - USER aodh -- cgit v1.2.3