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/aodh | |
| 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/aodh')
| -rw-r--r-- | docker/aodh/aodh-api/Dockerfile.j2 | 1 | ||||
| -rw-r--r-- | docker/aodh/aodh-evaluator/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/aodh/aodh-expirer/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/aodh/aodh-listener/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/aodh/aodh-notifier/Dockerfile.j2 | 2 |
5 files changed, 0 insertions, 9 deletions
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 |