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/heat | |
| 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/heat')
| -rw-r--r-- | docker/heat/heat-api-cfn/Dockerfile.j2 | 1 | ||||
| -rw-r--r-- | docker/heat/heat-api/Dockerfile.j2 | 1 | ||||
| -rw-r--r-- | docker/heat/heat-engine/Dockerfile.j2 | 2 |
3 files changed, 0 insertions, 4 deletions
diff --git a/docker/heat/heat-api-cfn/Dockerfile.j2 b/docker/heat/heat-api-cfn/Dockerfile.j2 index 0654edbfa..71ad40e8e 100644 --- a/docker/heat/heat-api-cfn/Dockerfile.j2 +++ b/docker/heat/heat-api-cfn/Dockerfile.j2 @@ -16,6 +16,5 @@ MAINTAINER {{ maintainer }} {% block heat_api_cfn_footer %}{% endblock %} {% block footer %}{% endblock %} -{{ include_footer }} USER heat diff --git a/docker/heat/heat-api/Dockerfile.j2 b/docker/heat/heat-api/Dockerfile.j2 index d7486cc7b..4ed685f53 100644 --- a/docker/heat/heat-api/Dockerfile.j2 +++ b/docker/heat/heat-api/Dockerfile.j2 @@ -19,6 +19,5 @@ RUN chmod 755 /usr/local/bin/kolla_heat_extend_start {% block heat_api_footer %}{% endblock %} {% block footer %}{% endblock %} -{{ include_footer }} USER heat diff --git a/docker/heat/heat-engine/Dockerfile.j2 b/docker/heat/heat-engine/Dockerfile.j2 index 48b600695..98339e0e5 100644 --- a/docker/heat/heat-engine/Dockerfile.j2 +++ b/docker/heat/heat-engine/Dockerfile.j2 @@ -21,6 +21,4 @@ MAINTAINER {{ maintainer }} {% block heat_engine_footer %}{% endblock %} {% block footer %}{% endblock %} -{{ include_footer }} - USER heat |