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/trove | |
| 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/trove')
| -rw-r--r-- | docker/trove/trove-api/Dockerfile.j2 | 1 | ||||
| -rw-r--r-- | docker/trove/trove-conductor/Dockerfile.j2 | 1 | ||||
| -rw-r--r-- | docker/trove/trove-guestagent/Dockerfile.j2 | 1 | ||||
| -rw-r--r-- | docker/trove/trove-taskmanager/Dockerfile.j2 | 1 |
4 files changed, 0 insertions, 4 deletions
diff --git a/docker/trove/trove-api/Dockerfile.j2 b/docker/trove/trove-api/Dockerfile.j2 index 5ac79271a..c3dd29a00 100644 --- a/docker/trove/trove-api/Dockerfile.j2 +++ b/docker/trove/trove-api/Dockerfile.j2 @@ -21,6 +21,5 @@ RUN chmod 755 /usr/local/bin/kolla_trove_extend_start {% block trove_api_footer %}{% endblock %} {% block footer %}{% endblock %} -{{ include_footer }} USER trove diff --git a/docker/trove/trove-conductor/Dockerfile.j2 b/docker/trove/trove-conductor/Dockerfile.j2 index 0941fae5f..a8a187acf 100644 --- a/docker/trove/trove-conductor/Dockerfile.j2 +++ b/docker/trove/trove-conductor/Dockerfile.j2 @@ -18,6 +18,5 @@ MAINTAINER {{ maintainer }} {% block trove_conductor_footer %}{% endblock %} {% block footer %}{% endblock %} -{{ include_footer }} USER trove diff --git a/docker/trove/trove-guestagent/Dockerfile.j2 b/docker/trove/trove-guestagent/Dockerfile.j2 index bcbe9aa5a..c5c5f8cad 100644 --- a/docker/trove/trove-guestagent/Dockerfile.j2 +++ b/docker/trove/trove-guestagent/Dockerfile.j2 @@ -18,6 +18,5 @@ MAINTAINER {{ maintainer }} {% block trove_guestagent_footer %}{% endblock %} {% block footer %}{% endblock %} -{{ include_footer }} USER trove diff --git a/docker/trove/trove-taskmanager/Dockerfile.j2 b/docker/trove/trove-taskmanager/Dockerfile.j2 index f59426646..4d2002842 100644 --- a/docker/trove/trove-taskmanager/Dockerfile.j2 +++ b/docker/trove/trove-taskmanager/Dockerfile.j2 @@ -18,6 +18,5 @@ MAINTAINER {{ maintainer }} {% block trove_taskmanager_footer %}{% endblock %} {% block footer %}{% endblock %} -{{ include_footer }} USER trove |