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/solum | |
| 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/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 |