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/solum | |
| 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/solum')
| -rw-r--r-- | docker/solum/solum-api/Dockerfile.j2 | 1 | ||||
| -rw-r--r-- | docker/solum/solum-conductor/Dockerfile.j2 | 1 | ||||
| -rw-r--r-- | docker/solum/solum-deployer/Dockerfile.j2 | 1 | ||||
| -rw-r--r-- | docker/solum/solum-worker/Dockerfile.j2 | 1 |
4 files changed, 0 insertions, 4 deletions
diff --git a/docker/solum/solum-api/Dockerfile.j2 b/docker/solum/solum-api/Dockerfile.j2 index 2a5de0e66..16e8c61c6 100644 --- a/docker/solum/solum-api/Dockerfile.j2 +++ b/docker/solum/solum-api/Dockerfile.j2 @@ -15,6 +15,5 @@ RUN chmod 755 /usr/local/bin/kolla_solum_extend_start {% block solum_api_footer %}{% endblock %} {% block footer %}{% endblock %} -{{ include_footer }} USER solum diff --git a/docker/solum/solum-conductor/Dockerfile.j2 b/docker/solum/solum-conductor/Dockerfile.j2 index a2c69ea0f..03f8a3819 100644 --- a/docker/solum/solum-conductor/Dockerfile.j2 +++ b/docker/solum/solum-conductor/Dockerfile.j2 @@ -12,6 +12,5 @@ RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ {% block solum_conductor_footer %}{% endblock %} {% block footer %}{% endblock %} -{{ include_footer }} USER solum diff --git a/docker/solum/solum-deployer/Dockerfile.j2 b/docker/solum/solum-deployer/Dockerfile.j2 index 44cb8ada4..782f2563d 100644 --- a/docker/solum/solum-deployer/Dockerfile.j2 +++ b/docker/solum/solum-deployer/Dockerfile.j2 @@ -12,6 +12,5 @@ RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ {% block solum_deployer_footer %}{% endblock %} {% block footer %}{% endblock %} -{{ include_footer }} USER solum diff --git a/docker/solum/solum-worker/Dockerfile.j2 b/docker/solum/solum-worker/Dockerfile.j2 index 509c03058..6ac2f9b32 100644 --- a/docker/solum/solum-worker/Dockerfile.j2 +++ b/docker/solum/solum-worker/Dockerfile.j2 @@ -12,6 +12,5 @@ RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ {% block solum_worker_footer %}{% endblock %} {% block footer %}{% endblock %} -{{ include_footer }} USER solum |