aboutsummaryrefslogtreecommitdiff
path: root/docker/manila
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-02-07 14:56:26 +0000
committerGerrit Code Review <review@openstack.org>2017-02-07 14:56:26 +0000
commitb43efe5377e60328183bf567504fc7b9ae9cbdeb (patch)
tree537e8edb1d063778898e82d352f96824e001fb60 /docker/manila
parent40130b2e7a591931ddac366dc6f8d085e1f83e37 (diff)
parente5903d5fa9ef545595f7e98b73eb3bb31b72b4bb (diff)
downloadkolla-b43efe5377e60328183bf567504fc7b9ae9cbdeb.tar.gz
kolla-b43efe5377e60328183bf567504fc7b9ae9cbdeb.zip
Merge "Remove include_header and include_footer in all Dockerfiles"
Diffstat (limited to 'docker/manila')
-rw-r--r--docker/manila/manila-api/Dockerfile.j21
-rw-r--r--docker/manila/manila-data/Dockerfile.j21
-rw-r--r--docker/manila/manila-scheduler/Dockerfile.j21
-rw-r--r--docker/manila/manila-share/Dockerfile.j21
4 files changed, 0 insertions, 4 deletions
diff --git a/docker/manila/manila-api/Dockerfile.j2 b/docker/manila/manila-api/Dockerfile.j2
index 70908d82c..c2b210a31 100644
--- a/docker/manila/manila-api/Dockerfile.j2
+++ b/docker/manila/manila-api/Dockerfile.j2
@@ -22,6 +22,5 @@ RUN chmod 755 /usr/local/bin/kolla_manila_extend_start
{% block manila_api_footer %}{% endblock %}
{% block footer %}{% endblock %}
-{{ include_footer }}
USER manila
diff --git a/docker/manila/manila-data/Dockerfile.j2 b/docker/manila/manila-data/Dockerfile.j2
index 4cdeba325..46cae63f1 100644
--- a/docker/manila/manila-data/Dockerfile.j2
+++ b/docker/manila/manila-data/Dockerfile.j2
@@ -40,6 +40,5 @@ RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
{% block manila_data_footer %}{% endblock %}
{% block footer %}{% endblock %}
-{{ include_footer }}
USER manila
diff --git a/docker/manila/manila-scheduler/Dockerfile.j2 b/docker/manila/manila-scheduler/Dockerfile.j2
index 56ee3ad3f..28b62b141 100644
--- a/docker/manila/manila-scheduler/Dockerfile.j2
+++ b/docker/manila/manila-scheduler/Dockerfile.j2
@@ -19,6 +19,5 @@ MAINTAINER {{ maintainer }}
{% block manila_scheduler_footer %}{% endblock %}
{% block footer %}{% endblock %}
-{{ include_footer }}
USER manila
diff --git a/docker/manila/manila-share/Dockerfile.j2 b/docker/manila/manila-share/Dockerfile.j2
index 42e8d1d53..d0a99ffd3 100644
--- a/docker/manila/manila-share/Dockerfile.j2
+++ b/docker/manila/manila-share/Dockerfile.j2
@@ -19,6 +19,5 @@ MAINTAINER {{ maintainer }}
{% block manila_share_footer %}{% endblock %}
{% block footer %}{% endblock %}
-{{ include_footer }}
USER manila