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/cinder | |
| 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/cinder')
| -rw-r--r-- | docker/cinder/cinder-api/Dockerfile.j2 | 1 | ||||
| -rw-r--r-- | docker/cinder/cinder-backup/Dockerfile.j2 | 1 | ||||
| -rw-r--r-- | docker/cinder/cinder-scheduler/Dockerfile.j2 | 1 | ||||
| -rw-r--r-- | docker/cinder/cinder-volume/Dockerfile.j2 | 1 |
4 files changed, 0 insertions, 4 deletions
diff --git a/docker/cinder/cinder-api/Dockerfile.j2 b/docker/cinder/cinder-api/Dockerfile.j2 index cbedd9fd4..eaef8f81a 100644 --- a/docker/cinder/cinder-api/Dockerfile.j2 +++ b/docker/cinder/cinder-api/Dockerfile.j2 @@ -55,6 +55,5 @@ RUN chmod 755 /usr/local/bin/kolla_cinder_extend_start {% block cinder_api_footer %}{% endblock %} {% block footer %}{% endblock %} -{{ include_footer }} USER cinder diff --git a/docker/cinder/cinder-backup/Dockerfile.j2 b/docker/cinder/cinder-backup/Dockerfile.j2 index 02a30c493..778482144 100644 --- a/docker/cinder/cinder-backup/Dockerfile.j2 +++ b/docker/cinder/cinder-backup/Dockerfile.j2 @@ -42,6 +42,5 @@ MAINTAINER {{ maintainer }} {% block cinder_backup_footer %}{% endblock %} {% block footer %}{% endblock %} -{{ include_footer }} USER cinder diff --git a/docker/cinder/cinder-scheduler/Dockerfile.j2 b/docker/cinder/cinder-scheduler/Dockerfile.j2 index b19cb8359..da3a4a4b8 100644 --- a/docker/cinder/cinder-scheduler/Dockerfile.j2 +++ b/docker/cinder/cinder-scheduler/Dockerfile.j2 @@ -19,6 +19,5 @@ MAINTAINER {{ maintainer }} {% block cinder_scheduler_footer %}{% endblock %} {% block footer %}{% endblock %} -{{ include_footer }} USER cinder diff --git a/docker/cinder/cinder-volume/Dockerfile.j2 b/docker/cinder/cinder-volume/Dockerfile.j2 index ef90fcd91..3472a64af 100644 --- a/docker/cinder/cinder-volume/Dockerfile.j2 +++ b/docker/cinder/cinder-volume/Dockerfile.j2 @@ -53,6 +53,5 @@ RUN chmod 750 /etc/sudoers.d \ {% block cinder_volume_footer %}{% endblock %} {% block footer %}{% endblock %} -{{ include_footer }} USER cinder |