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/mistral | |
| 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/mistral')
| -rw-r--r-- | docker/mistral/mistral-api/Dockerfile.j2 | 1 | ||||
| -rw-r--r-- | docker/mistral/mistral-engine/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/mistral/mistral-executor/Dockerfile.j2 | 2 |
3 files changed, 0 insertions, 5 deletions
diff --git a/docker/mistral/mistral-api/Dockerfile.j2 b/docker/mistral/mistral-api/Dockerfile.j2 index 579f005dc..b393cffdc 100644 --- a/docker/mistral/mistral-api/Dockerfile.j2 +++ b/docker/mistral/mistral-api/Dockerfile.j2 @@ -19,6 +19,5 @@ RUN chmod 755 /usr/local/bin/kolla_mistral_extend_start {% block mistral_api_footer %}{% endblock %} {% block footer %}{% endblock %} -{{ include_footer }} USER mistral diff --git a/docker/mistral/mistral-engine/Dockerfile.j2 b/docker/mistral/mistral-engine/Dockerfile.j2 index 458ff881e..a054d128b 100644 --- a/docker/mistral/mistral-engine/Dockerfile.j2 +++ b/docker/mistral/mistral-engine/Dockerfile.j2 @@ -17,6 +17,4 @@ MAINTAINER {{ maintainer }} {% block mistral_engine_footer %}{% endblock %} {% block footer %}{% endblock %} -{{ include_footer }} - USER mistral diff --git a/docker/mistral/mistral-executor/Dockerfile.j2 b/docker/mistral/mistral-executor/Dockerfile.j2 index 382d0e33c..ac68130ae 100644 --- a/docker/mistral/mistral-executor/Dockerfile.j2 +++ b/docker/mistral/mistral-executor/Dockerfile.j2 @@ -17,6 +17,4 @@ MAINTAINER {{ maintainer }} {% block mistral_executor_footer %}{% endblock %} {% block footer %}{% endblock %} -{{ include_footer }} - USER mistral |